Merge branch '11_3_week' into develop

src/views/supply/apply/apply_list.vue

@@ -381,15 +381,9 @@
               <template slot-scope="scope">
                 <el-popconfirm
                   v-if="
-                  !isCustomer &&
                     $checkBtnRole('apply', $route.meta.roles) &&
-                   ( !scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'SAVE') ||
-                    !isCustomer &&
-                     $checkBtnRole('apply', $route.meta.roles) &&
-                    ( scope.row.automaticStatus &&
-                      scope.row.examineStatus === 'SAVE' &&
-                      scope.row.type == 2)
+                    !scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'SAVE'
                   "
                   style="margin-right: 10px"
                   title="确定申请吗？"
@@ -399,15 +393,9 @@
                 </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' &&
-                      scope.row.type == 2)
+                    !scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT'
                   "
                   style="margin-right: 10px"
                   title="确定撤回吗？"
@@ -417,15 +405,9 @@
                 </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' &&
-                      scope.row.type == 2)
+                    !scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'OK'
                   "
                   style="margin-right: 10px"
                   title="确定弃审吗？"
@@ -435,7 +417,6 @@
                 </el-popconfirm>
                 <el-button
                   v-if="
-                  !isCustomer &&
                     $checkBtnRole('edit', $route.meta.roles) &&
                     !scope.row.automaticStatus &&
                     (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
@@ -448,16 +429,10 @@
                 </el-button>
                 <el-button
                   v-if="
-                  !isCustomer &&
-                    ($checkBtnRole('edit', $route.meta.roles) &&
-                      (!scope.row.automaticStatus &&
+                    $checkBtnRole('edit', $route.meta.roles) &&
+                      !scope.row.automaticStatus &&
                       (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
-                      scope.row.type === 2) )||
-                      !isCustomer &&
-                       $checkBtnRole('apply', $route.meta.roles) &&
-                    (scope.row.automaticStatus &&
-                      scope.row.examineStatus === 'SAVE' &&
-                      scope.row.type == 2)
+                      scope.row.type === 2
                   "
                   type="text"
                   @click="toReturnForm(scope.row)"
@@ -467,12 +442,8 @@
                 <el-button
                   v-if="
                     $checkBtnRole('examine', $route.meta.roles) &&
-                    (!scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'WAIT') ||
-                     $checkBtnRole('apply', $route.meta.roles) &&
-                    (scope.row.automaticStatus &&
-                      scope.row.examineStatus === 'WAIT' &&
-                      scope.row.type == 2)
+                    !scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT'
                   "
                   type="text"
                   @click="toExamine(scope.row)"
@@ -483,13 +454,8 @@
                 <el-popconfirm
                   v-if="
                     $checkBtnRole('del', $route.meta.roles) &&
-                   ( !scope.row.automaticStatus &&
-                    scope.row.examineStatus !== 'OK')
-                    ||
-                     $checkBtnRole('apply', $route.meta.roles) &&
-                    (scope.row.automaticStatus &&
-                      scope.row.examineStatus !== 'OK' &&
-                      scope.row.type == 2)
+                    !scope.row.automaticStatus &&
+                    scope.row.examineStatus !== 'OK'
                   "
                   style="margin-left: 10px"
                   title="确定删除吗？"
@@ -632,10 +598,6 @@ export default {
         approvalName: this.screenForm.approvalName
       }
     }
-    ,
-    isCustomer() {
-      return this.$store.getters.customerId && this.$store.getters.customerNumber
-    }
   },
 
   watch: {

src/views/supply/apply/engin_list.vue

@@ -3,14 +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>
               <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
                   item.label
-                }}
-              </el-radio-button>
+                }}</el-radio-button>
             </el-radio-group>
           </template>
           <template #right_btn>
@@ -172,8 +171,7 @@
               type="primary"
               icon="el-icon-plus"
               @click="toForm()"
-            >发货申请
-            </el-button
+            >发货申请</el-button
             >
             <el-button
               v-if="$checkBtnRole('refund', $route.meta.roles)"
@@ -181,8 +179,7 @@
               type="primary"
               icon="el-icon-plus"
               @click="toReturnForm()"
-            >退货申请
-            </el-button
+            >退货申请</el-button
             >
             <el-button
               v-if="$checkBtnRole('examine', $route.meta.roles)"
@@ -191,8 +188,7 @@
               icon="el-icon-finished"
               :disabled="multipleSelection.length < 1"
               @click="batchExamine"
-            >批量审批
-            </el-button
+            >批量审批</el-button
             >
           </div>
           <div class="fr">
@@ -410,14 +406,9 @@
               <template slot-scope="scope">
                 <el-popconfirm
                   v-if="
-                          !isCustomer &&  $checkBtnRole('apply', $route.meta.roles) &&
-                    (!scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'SAVE' )||
-                    !isCustomer &&
-                     $checkBtnRole('apply', $route.meta.roles) &&
-                    (scope.row.automaticStatus &&
-                      scope.row.examineStatus === 'SAVE' &&
-                      scope.row.type == 2)
+                    !scope.row.automaticStatus &&
+                    $checkBtnRole('apply', $route.meta.roles) &&
+                    scope.row.examineStatus === 'SAVE'
                   "
                   style="margin-right: 10px"
                   title="确定申请吗？"
@@ -427,14 +418,9 @@
                 </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 === 'OK' &&
-                      scope.row.type == 2)
+                    !scope.row.automaticStatus &&
+                    $checkBtnRole('apply', $route.meta.roles) &&
+                    scope.row.examineStatus === 'WAIT'
                   "
                   style="margin-right: 10px"
                   title="确定撤回吗？"
@@ -444,15 +430,9 @@
                 </el-popconfirm>
                 <el-popconfirm
                   v-if="
-                  !isCustomer &&
+                    !scope.row.automaticStatus &&
                     $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' &&
-                      scope.row.type == 2)
+                    scope.row.examineStatus === 'OK'
                   "
                   style="margin-right: 10px"
                   title="确定弃审吗？"
@@ -462,7 +442,6 @@
                 </el-popconfirm>
                 <el-button
                   v-if="
-                  !isCustomer &&
                     !scope.row.automaticStatus &&
                     $checkBtnRole('edit', $route.meta.roles) &&
                     (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
@@ -475,16 +454,10 @@
                 </el-button>
                 <el-button
                   v-if="
-                  !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 &&
-                       $checkBtnRole('apply', $route.meta.roles) &&
-                      (scope.row.automaticStatus &&
-                      scope.row.examineStatus === 'SAVE' &&
-                      scope.row.type == 2)
+                      scope.row.type === 2
                   "
                   type="text"
                   @click="toReturnForm(scope.row)"
@@ -493,25 +466,19 @@
                 </el-button>
                 <el-button
                   v-if="
-                  $checkBtnRole('examine', $route.meta.roles) &&
-                    (!scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'WAIT') ||
-                     $checkBtnRole('apply', $route.meta.roles) &&
-                     (scope.row.automaticStatus && scope.row.examineStatus === 'WAIT' &&
-                      scope.row.type == 2)
+                    !scope.row.automaticStatus &&
+                    $checkBtnRole('examine', $route.meta.roles) &&
+                    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="(!scope.row.automaticStatus && scope.row.examineStatus !== 'OK')  ||
-                    (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)"
@@ -659,10 +626,6 @@ export default {
         refRegionWork: this.screenForm.refRegionWork
       }
     }
-    ,
-    isCustomer() {
-      return this.$store.getters.customerId && this.$store.getters.customerNumber
-    }
   },
 
   watch: {
@@ -887,7 +850,7 @@ export default {
      * @param {String} index - 索引值
      * @return Boolean
      */
-    selectable: function(row, index) {
+    selectable: function (row, index) {
       if (row.automaticStatus) {
         return false
       }