发货单按钮权限设置复原

src/views/supply/apply/apply_list.vue

@@ -7,12 +7,10 @@
           <template #left_btn>
             <el-radio-group v-model="screenForm.status" size="mini" @change="getList()">
               <el-radio-button label="">全部</el-radio-button>
-              <template v-for="(item, index) in statusList">
-                <el-radio-button v-if="index !== 3" :key="index" :label="item.value">{{
-                    item.label
-                  }}
-                </el-radio-button>
-              </template>
+              <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
+                  item.label
+                }}
+              </el-radio-button>
             </el-radio-group>
           </template>
           <template #right_btn>
@@ -384,13 +382,8 @@
                 <el-popconfirm
                   v-if="
                     $checkBtnRole('apply', $route.meta.roles) &&
-                    (( !isCustomer && !scope.row.automaticStatus &&
-                    (scope.row.examineStatus === 'SAVE'|| scope.row.examineStatus === 'FAIL'))||(isCustomer && !scope.row.automaticStatus &&
-                    (scope.row.examineStatus === 'SAVE'|| scope.row.examineStatus === 'FAIL') && scope.row.type!=2) || (
-                    !isCustomer  &&  scope.row.automaticStatus &&
-                     (scope.row.examineStatus === 'SAVE'|| scope.row.examineStatus === 'FAIL') &&
-                     scope.row.type===2
-                    ) )
+                    !scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'SAVE'
                   "
                   style="margin-right: 10px"
                   title="确定申请吗？"
@@ -401,10 +394,8 @@
                 <el-popconfirm
                   v-if="
                     $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)||( !isCustomer  && scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'WAIT'&& scope.row.type==2))
+                    !scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT'
                   "
                   style="margin-right: 10px"
                   title="确定撤回吗？"
@@ -415,10 +406,8 @@
                 <el-popconfirm
                   v-if="
                     $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)||( !isCustomer && scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'OK' && scope.row.type==2))
+                    !scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'OK'
                   "
                   style="margin-right: 10px"
                   title="确定弃审吗？"
@@ -440,15 +429,14 @@
                 </el-button>
                 <el-button
                   v-if="
-                    $checkBtnRole('edit', $route.meta.roles) &&
-                      ((!isCustomer && !scope.row.automaticStatus &&
+                    ($checkBtnRole('edit', $route.meta.roles) &&
+                      !scope.row.automaticStatus &&
                       (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
-                      scope.row.type === 2)||(isCustomer && !scope.row.automaticStatus &&
-                    (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') && scope.row.type!=2 && scope.row.type !==1)  ||
-                      ( !isCustomer && scope.row.automaticStatus &&
-                     (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
-                     scope.row.type===2)
-                      )
+                      scope.row.type === 2) ||
+                    ($checkBtnRole('edit', $route.meta.roles) &&
+                      scope.row.automaticStatus &&
+                      scope.row.examineStatus === 'SAVE' &&
+                      scope.row.type == 2)
                   "
                   type="text"
                   @click="toReturnForm(scope.row)"
@@ -458,23 +446,20 @@
                 <el-button
                   v-if="
                     $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) || (!isCustomer && scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'WAIT' && scope.row.type==2))
+                    !scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT'
                   "
                   type="text"
                   @click="toExamine(scope.row)"
                 >
-                  审核
+                  审单
                 </el-button>
                 <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' ) ||(isCustomer && !scope.row.automaticStatus &&
-                    scope.row.examineStatus !== 'OK' && scope.row.type!=2)   || ( !isCustomer &&scope.row.automaticStatus && scope.row.examineStatus !== 'OK' && scope.row.type==2 ) )
+                    !scope.row.automaticStatus &&
+                    scope.row.examineStatus !== 'OK'
                   "
                   style="margin-left: 10px"
                   title="确定删除吗？"
@@ -569,7 +554,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+        //  // { label: '审核驳回', value: 'FAIL' },,
         { label: '已关闭', value: 'CLOSE' }
       ],
       orderTypeList: [
@@ -592,9 +577,7 @@ export default {
         status: '',
         remark: ''
       },
-      categoryList: [],
-      isCustomer: JSON.parse(localStorage.getItem('supply_user')).isCustomer
-
+      categoryList: []
     }
   },
 
@@ -820,7 +803,7 @@ export default {
       ids = Array.from(new Set(ids))
       examineBatchApply({
         ids: ids.join(','),
-        examineStatus: this.examineForm.status === 'FAIL' ? 'SAVE' : 'OK',
+        examineStatus: this.examineForm.status,
         approvalRemark: this.examineForm.remark
       }).then(res => {
         this.isShowExamineDialog = false

src/views/supply/apply/engin_list.vue

@@ -3,17 +3,13 @@
     <div v-show="!isShowDetail && !isShowExamine && !isShowForm && !isShowReturnForm">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <Collapse :screen-form="screenForm">
+        <Collapse   :screen-form="screenForm">
           <template #left_btn>
             <el-radio-group size="mini" v-model="screenForm.status" @change="getList()">
               <el-radio-button label="">全部</el-radio-button>
-              <template v-for="(item, index) in statusList" >
-                <el-radio-button v-if="index !== 3" :key="index" :label="item.value">{{
-                    item.label
-                  }}
-                </el-radio-button>
-              </template>
-
+              <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
+                  item.label
+                }}</el-radio-button>
             </el-radio-group>
           </template>
           <template #right_btn>
@@ -175,8 +171,7 @@
               type="primary"
               icon="el-icon-plus"
               @click="toForm()"
-            >发货申请
-            </el-button
+            >发货申请</el-button
             >
             <el-button
               v-if="$checkBtnRole('refund', $route.meta.roles)"
@@ -184,8 +179,7 @@
               type="primary"
               icon="el-icon-plus"
               @click="toReturnForm()"
-            >退货申请
-            </el-button
+            >退货申请</el-button
             >
             <el-button
               v-if="$checkBtnRole('examine', $route.meta.roles)"
@@ -194,8 +188,7 @@
               icon="el-icon-finished"
               :disabled="multipleSelection.length < 1"
               @click="batchExamine"
-            >批量审批
-            </el-button
+            >批量审批</el-button
             >
           </div>
           <div class="fr">
@@ -413,14 +406,9 @@
               <template slot-scope="scope">
                 <el-popconfirm
                   v-if="
+                    !scope.row.automaticStatus &&
                     $checkBtnRole('apply', $route.meta.roles) &&
-                    ((!isCustomer &&!scope.row.automaticStatus &&
-                    (scope.row.examineStatus === 'SAVE'|| scope.row.examineStatus === 'FAIL'))||(isCustomer && !scope.row.automaticStatus &&
-                    (scope.row.examineStatus === 'SAVE'|| scope.row.examineStatus === 'FAIL') && scope.row.type!=2)  || (
-                     !isCustomer  && scope.row.automaticStatus &&
-                    (scope.row.examineStatus === 'SAVE'|| scope.row.examineStatus === 'FAIL') &&
-                     scope.row.type===2
-                    ) )
+                    scope.row.examineStatus === 'SAVE'
                   "
                   style="margin-right: 10px"
                   title="确定申请吗？"
@@ -430,11 +418,9 @@
                 </el-popconfirm>
                 <el-popconfirm
                   v-if="
-                  $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) ||(!isCustomer  && scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'WAIT'&& scope.row.type==2))
+                    !scope.row.automaticStatus &&
+                    $checkBtnRole('apply', $route.meta.roles) &&
+                    scope.row.examineStatus === 'WAIT'
                   "
                   style="margin-right: 10px"
                   title="确定撤回吗？"
@@ -444,11 +430,9 @@
                 </el-popconfirm>
                 <el-popconfirm
                   v-if="
+                    !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) ||( !isCustomer  && scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'OK' && scope.row.type==2))
+                    scope.row.examineStatus === 'OK'
                   "
                   style="margin-right: 10px"
                   title="确定弃审吗？"
@@ -458,7 +442,7 @@
                 </el-popconfirm>
                 <el-button
                   v-if="
-                     !scope.row.automaticStatus &&
+                    !scope.row.automaticStatus &&
                     $checkBtnRole('edit', $route.meta.roles) &&
                     (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
                     scope.row.type === 1
@@ -470,14 +454,14 @@
                 </el-button>
                 <el-button
                   v-if="
-                  $checkBtnRole('edit', $route.meta.roles) &&
-                    (( !isCustomer &&!scope.row.automaticStatus &&
+                    (!scope.row.automaticStatus &&
+                      $checkBtnRole('edit', $route.meta.roles) &&
                       (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
-                      scope.row.type === 2 )||(isCustomer && !scope.row.automaticStatus &&
-                    (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') && scope.row.type!=2 && scope.type!==1) ||
-                       (!isCustomer  &&scope.row.automaticStatus &&
-                      (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
-                     scope.row.type===2))
+                      scope.row.type === 2) ||
+                    ($checkBtnRole('edit', $route.meta.roles) &&
+                      scope.row.automaticStatus &&
+                      scope.row.examineStatus === 'SAVE' &&
+                      scope.row.type == 2)
                   "
                   type="text"
                   @click="toReturnForm(scope.row)"
@@ -486,24 +470,19 @@
                 </el-button>
                 <el-button
                   v-if="
+                    !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)|| ( !isCustomer  &&scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'WAIT' && scope.row.type==2))
+                    scope.row.examineStatus === 'WAIT'
                   "
                   type="text"
                   @click="toExamine(scope.row)"
                 >
-                  审核
+                  审单
                 </el-button>
-                <el-button type="text" @click="toDetail(scope.row)"> 详情</el-button>
+                <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')||(isCustomer && !scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'OK' && scope.row.type!=2) || ( !isCustomer  && scope.row.automaticStatus && scope.row.examineStatus !== 'OK' && scope.row.type==2 ) )"
+                  v-if="!scope.row.automaticStatus && scope.row.examineStatus !== 'OK'"
                   style="margin-left: 10px"
                   title="确定删除吗？"
                   @onConfirm="handleDelete(scope.row.id)"
@@ -599,7 +578,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+        //  // { label: '审核驳回', value: 'FAIL' },,
         { label: '已关闭', value: 'CLOSE' }
       ],
       orderTypeList: [
@@ -623,9 +602,7 @@ export default {
         remark: ''
       },
       isShow: false,
-      categoryList: [],
-      isCustomer: JSON.parse(localStorage.getItem('supply_user')).isCustomer,
-
+      categoryList: []
     }
   },
 
@@ -851,10 +828,9 @@ export default {
         return item.id
       })
       ids = Array.from(new Set(ids))
-
       examineBatchEngin({
         ids: ids.join(','),
-        examineStatus: this.examineForm.status === 'FAIL' ? 'SAVE' : 'OK',
+        examineStatus: this.examineForm.status,
         approvalRemark: this.examineForm.remark
       }).then(res => {
         this.isShowExamineDialog = false
@@ -878,7 +854,7 @@ export default {
      * @param {String} index - 索引值
      * @return Boolean
      */
-    selectable: function(row, index) {
+    selectable: function (row, index) {
       if (row.automaticStatus) {
         return false
       }