snow 2 jaren geleden
bovenliggende
commit
022d357417

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/0.js


+ 2 - 1
src/mixins/privateField.js

@@ -2,7 +2,7 @@ import { mapGetters } from 'vuex'
 
 const privateField = {
   computed: {
-    ...mapGetters(['private_field', 'isSupertube', 'sourceLevel'])
+    ...mapGetters(['private_field', 'isSupertube', 'originLevel'])
   },
   methods: {
     /**
@@ -15,6 +15,7 @@ const privateField = {
     isDisplayPrivateField(type) {
       const vm = this
       const { isSupertube, originLevel, private_field } = vm
+      console.log(originLevel, private_field)
       if (isSupertube) return true
       if (originLevel === '3' && type === '1') return true
       if (originLevel === '2' && private_field && private_field.includes(type)) return true

+ 3 - 3
src/views/purchaseIn/purchaseDiffOrder/index.vue

@@ -122,8 +122,7 @@
                         searchList();
                       "
                   >
-                   <el-option value="0" label="非库存品" />
-                   <el-option value="1" label="库存品" />
+                   <el-option v />
                   </el-select>
                 </el-col>
 
@@ -247,7 +246,7 @@ import asyncRequest from "@/apis/service/purchaseIn/purchaseDiffOrder";
 import columns from "./columns";
 import { mapGetters } from "vuex";
 import companyHelper from "@/mixins/companyHelper"
-import { cg_order_source_options } from "@/assets/js/statusList";
+import { cg_order_source_options ,cg_order_type_options} from "@/assets/js/statusList";
 
 
 export default {
@@ -270,6 +269,7 @@ export default {
   data() {
     return {
       cg_order_source_options,
+      cg_order_type_options,
       supplierNo:"",
       sitem: null,
       select: "cgdNo",

+ 1 - 1
src/views/purchaseIn/wsmInOrder/index.vue

@@ -150,7 +150,7 @@
               </el-col>
 
 
-              <el-col :span="4" style="width: 130px; margin-top:10px">
+              <el-col :span="4" style="width: 130px; margin-top:10px;margin-right:10px">
                 <el-select
                   :size="searchSize"
                   v-model="parmValue.order_source"

Some files were not shown because too many files changed in this diff