snow пре 1 година
родитељ
комит
3bc60d1103

+ 11 - 19
src/views/dataCorrection/vendorCorrection/components/correctionForm.vue

@@ -267,13 +267,13 @@
 </template>
 
 <script>
-import addEdit from "./addEdit.vue";
 import { statusOptions, ShowDataTableColumns, mianColumns } from "./_columns";
 import asyncRequest from "@/apis/service/dataCorrection/order";
 import { cg_order_type_options } from "@/assets/js/statusList";
 import WaitApproval from "./waitApproval.vue";
-import resToken from "../../../../mixins/resToken";
-import { isnumber } from "../../../../utils/validate";
+import { isnumber } from "@/utils/validate";
+import resToken from "@/mixins/resToken";
+import addEdit from "./addEdit.vue";
 
 const VALID_OA_CODE = function(_1, _2, callback) {
   const { oaCode } = this.ruleForm;
@@ -319,24 +319,16 @@ export default {
     }
   },
   data() {
-    const binded_valid_oa_code = VALID_OA_CODE.bind(this);
-    const binded_valid_supplier = VALID_SUPPLIER.bind(this);
+    const bindedValidOACode = VALID_OA_CODE.bind(this);
+    const bindedValidSupplier = VALID_SUPPLIER.bind(this);
 
     return {
-      activeNames: ["1", "2", "3", "4"],
-      mianColumns,
       detail: {},
+      mianColumns,
+      activeNames: ["1", "2", "3", "4"],
       mapComponent: {
-        create: {
-          container: "ElForm",
-          item: "ElFormItem",
-          labelProp: "label"
-        },
-        update: {
-          container: "ElCollapse",
-          item: "ElCollapseItem",
-          labelProp: "title"
-        }
+        create: { container: "ElForm",  item: "ElFormItem", labelProp: "label" },
+        update: { container: "ElCollapse", item: "ElCollapseItem", labelProp: "title" }
       },
       loading: false,
       newTime: "",
@@ -374,14 +366,14 @@ export default {
           {
             required: true,
             trigger: "change",
-            validator: binded_valid_supplier
+            validator: bindedValidSupplier
           }
         ],
         oaCode: [
           {
             required: true,
             trigger: "change",
-            validator: binded_valid_oa_code
+            validator: bindedValidOACode
           }
         ],
         uid: [

+ 2 - 2
src/views/netOrderEntry/prestoreRecordingOrders/index.vue

@@ -173,7 +173,7 @@
 
       <template #operation="{ scope }">
         <el-tooltip
-          v-if="(powers.some((i) => i == '007') && !isSupertube) || isSupertube"
+          v-if="((powers.some((i) => i == '007') && !isSupertube) || isSupertube) && Number(scope.row.status) === 2"
           effect="dark"
           content="详情"
           placement="top"
@@ -181,7 +181,7 @@
           <i class="el-icon-view tb-icon" @click="openModal(scope.row, '007')"></i>
         </el-tooltip>
         <el-tooltip
-          v-if="powers.some((i) => i == '005') && !isSupertube"
+          v-if="(powers.some((i) => i == '005') && !isSupertube) && Number(scope.row.status) === 2"
           effect="dark"
           content="修改"
           placement="top"

+ 1 - 7
src/views/sellOut/project/components/grossForm.vue

@@ -56,17 +56,11 @@ export default {
     },
   },
   watch: {
-    // showModel: function (val) {
-    //   this.showModelThis = val;
-    //   if (val) {
-    //     this.initForm();
-    //   }
-    // },
     newTime: function (val) {
       if (val) {
         this.initForm();
       }
-    },
+    }
   },
   data() {
     const validate_sale_price = (rule, value, callback) => {

+ 3 - 2
src/views/sellOut/project/detail.vue

@@ -65,8 +65,9 @@
           label="方案制作"
           name="3"
           v-if="
-            queryType !== 'add' &&
-            (status + '' === '3' || status + '' === '4' || status + '' === '5' || status + '' === '6') && !isSupertube
+            (queryType !== 'add' && 
+            (status + '' === '3' || status + '' === '4' || status + '' === '5' || status + '' === '6') && !isSupertube) ||
+            isSupertube
           "
         >
           <set-plan