退货申请单权限

src/views/supply/apply/apply_list.vue

@@ -382,8 +382,11 @@
                 <el-popconfirm
                   v-if="
                     $checkBtnRole('apply', $route.meta.roles) &&
-                    !scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'SAVE'
+                   ( !scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'SAVE') ||
+                    ( scope.row.automaticStatus &&
+                      scope.row.examineStatus === 'SAVE' &&
+                      scope.row.type == 2)
                   "
                   style="margin-right: 10px"
                   title="确定申请吗？"
@@ -394,8 +397,11 @@
                 <el-popconfirm
                   v-if="
                     $checkBtnRole('apply', $route.meta.roles) &&
-                    !scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'WAIT'
+                    (!scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT') ||
+                    (scope.row.automaticStatus &&
+                      scope.row.examineStatus === 'WAIT' &&
+                      scope.row.type == 2)
                   "
                   style="margin-right: 10px"
                   title="确定撤回吗？"
@@ -406,8 +412,11 @@
                 <el-popconfirm
                   v-if="
                     $checkBtnRole('examine', $route.meta.roles) &&
-                    !scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'OK'
+                    (!scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'OK') ||
+                    (scope.row.automaticStatus &&
+                      scope.row.examineStatus === 'OK' &&
+                      scope.row.type == 2)
                   "
                   style="margin-right: 10px"
                   title="确定弃审吗？"
@@ -430,11 +439,10 @@
                 <el-button
                   v-if="
                     ($checkBtnRole('edit', $route.meta.roles) &&
-                      !scope.row.automaticStatus &&
+                      (!scope.row.automaticStatus &&
                       (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
-                      scope.row.type === 2) ||
-                    ($checkBtnRole('edit', $route.meta.roles) &&
-                      scope.row.automaticStatus &&
+                      scope.row.type === 2) )||
+                    (scope.row.automaticStatus &&
                       scope.row.examineStatus === 'SAVE' &&
                       scope.row.type == 2)
                   "
@@ -446,8 +454,11 @@
                 <el-button
                   v-if="
                     $checkBtnRole('examine', $route.meta.roles) &&
-                    !scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'WAIT'
+                    (!scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT') ||
+                    (scope.row.automaticStatus &&
+                      scope.row.examineStatus === 'WAIT' &&
+                      scope.row.type == 2)
                   "
                   type="text"
                   @click="toExamine(scope.row)"

src/views/supply/apply/engin_list.vue

@@ -406,9 +406,12 @@
               <template slot-scope="scope">
                 <el-popconfirm
                   v-if="
-                    !scope.row.automaticStatus &&
-                    $checkBtnRole('apply', $route.meta.roles) &&
-                    scope.row.examineStatus === 'SAVE'
+                                      $checkBtnRole('apply', $route.meta.roles) &&
+                    (!scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'SAVE' )||
+                    (scope.row.automaticStatus &&
+                      scope.row.examineStatus === 'SAVE' &&
+                      scope.row.type == 2)
                   "
                   style="margin-right: 10px"
                   title="确定申请吗？"
@@ -418,9 +421,12 @@
                 </el-popconfirm>
                 <el-popconfirm
                   v-if="
-                    !scope.row.automaticStatus &&
-                    $checkBtnRole('apply', $route.meta.roles) &&
-                    scope.row.examineStatus === 'WAIT'
+                                      $checkBtnRole('apply', $route.meta.roles) &&
+                    (!scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT') ||
+                      (scope.row.automaticStatus &&
+                      scope.row.examineStatus === 'OK' &&
+                      scope.row.type == 2)
                   "
                   style="margin-right: 10px"
                   title="确定撤回吗？"
@@ -430,9 +436,12 @@
                 </el-popconfirm>
                 <el-popconfirm
                   v-if="
-                    !scope.row.automaticStatus &&
                     $checkBtnRole('examine', $route.meta.roles) &&
-                    scope.row.examineStatus === 'OK'
+                    (!scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'OK') ||
+                      (scope.row.automaticStatus &&
+                      scope.row.examineStatus === 'OK' &&
+                      scope.row.type == 2)
                   "
                   style="margin-right: 10px"
                   title="确定弃审吗？"
@@ -454,12 +463,11 @@
                 </el-button>
                 <el-button
                   v-if="
-                    (!scope.row.automaticStatus &&
                       $checkBtnRole('edit', $route.meta.roles) &&
+                       (!scope.row.automaticStatus &&
                       (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
                       scope.row.type === 2) ||
-                    ($checkBtnRole('edit', $route.meta.roles) &&
-                      scope.row.automaticStatus &&
+                      (scope.row.automaticStatus &&
                       scope.row.examineStatus === 'SAVE' &&
                       scope.row.type == 2)
                   "
@@ -470,9 +478,12 @@
                 </el-button>
                 <el-button
                   v-if="
-                    !scope.row.automaticStatus &&
-                    $checkBtnRole('examine', $route.meta.roles) &&
-                    scope.row.examineStatus === 'WAIT'
+                  $checkBtnRole('examine', $route.meta.roles) &&
+                    (!scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT') ||
+                     (scope.row.automaticStatus &&
+                      scope.row.examineStatus === 'WAIT' &&
+                      scope.row.type == 2)
                   "
                   type="text"
                   @click="toExamine(scope.row)"

src/views/supply/policy/components/retail_form.vue

@@ -65,7 +65,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-<!--        <el-col :span="24" :sm="12" :lg="12" >-->
+<!--        <el-col :span="24" :sm="12" :lg="12" v-if="goodsList.length && commercialType">-->
 <!--          <el-form-item label="计划单" prop="isPlanOrder">-->
 <!--            <el-radio-group v-model="mainForm.isPlanOrder">-->
 <!--              <el-radio :label="true">是</el-radio>-->
@@ -73,7 +73,7 @@
 <!--            </el-radio-group>-->
 <!--          </el-form-item>-->
 <!--        </el-col>-->
-        <el-col :span="24" :sm="12" :lg="12" v-if="goodsList.length && commercialType">
+        <el-col :span="24" :sm="12" :lg="12" >
           <el-form-item label="计划单" prop="isPlanOrder">
             <el-radio-group v-model="mainForm.isPlanOrder">
               <el-radio :label="true">是</el-radio>