瀏覽代碼

计划单

zhouhao 2 年之前
父節點
當前提交
bd94e6c105

+ 2 - 0
src/views/supply/apply/apply_list.vue

@@ -385,6 +385,7 @@
                     $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' &&
@@ -448,6 +449,7 @@
                       (!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' &&

+ 2 - 0
src/views/supply/apply/engin_list.vue

@@ -413,6 +413,7 @@
                           !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' &&
@@ -476,6 +477,7 @@
                        (!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' &&

+ 1 - 0
src/views/supply/retail/components/retail_form.vue

@@ -733,6 +733,7 @@ export default {
         this.mainForm.remark = data.remark
         this.correspondName = data.correspondName
         this.warehouseValue = data.correspondId
+        this.mainForm.isPlanOrder = data.isPlanOrder
         data.retailOrderItemList.forEach(item => {
           item.correspondName = data.correspondName
           item.warehouseValue = data.correspondId