695593266@qq.com hace 3 meses
padre
commit
07f45f6349

+ 29 - 1
src/views/material/BOMmanage/components/attribute.vue

@@ -219,7 +219,19 @@
 
       <el-row>
         <el-col :span="8" label-width="100px">
-          <el-form-item label="基本数量" prop="baseCount">
+          <el-form-item
+            label="基本数量"
+            prop="baseCount"
+            v-if="clientEnvironmentId != 9"
+          >
+            <el-input
+              placeholder=""
+              v-model="attributeData.baseCount"
+              :disabled="attributeData.approvalStatus != 0"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="可制件数" prop="baseCount" v-else>
             <el-input
               placeholder=""
               v-model="attributeData.baseCount"
@@ -228,6 +240,16 @@
           </el-form-item>
         </el-col>
 
+        <!-- <el-col :span="8" label-width="100px">
+          <el-form-item label="可制件数" prop="baseCount">
+            <el-input
+              placeholder=""
+              v-model="attributeData.baseCount"
+              :disabled="attributeData.approvalStatus != 0"
+            ></el-input>
+          </el-form-item>
+        </el-col> -->
+
         <el-col :span="8" label-width="100px">
           <el-form-item label="物料库路径" prop="name">
             <el-input
@@ -380,6 +402,12 @@
       };
     },
 
+    computed: {
+      clientEnvironmentId() {
+        return this.$store.state.user.info.clientEnvironmentId;
+      }
+    },
+
     created() {
       // this.getDictList('productionType');
       this.getAttriButeList('inventory_type');

+ 11 - 3
src/views/material/BOMmanage/components/detailedList.vue

@@ -290,6 +290,7 @@
     data() {
       return {
         produceTypeList,
+        clientEnvironmentId: this.$store.state.user.info.clientEnvironmentId,
         pagination: {
           tableTotal: 0
         },
@@ -370,6 +371,15 @@
             label: '生产类型',
             width: 260
           },
+
+          {
+            prop: 'size',
+            slot: 'size',
+            label: '下料尺寸',
+            width: 100,
+            show: this.clientEnvironmentId == 9 ? true : false
+          },
+
           {
             prop: 'attributeType',
             slot: 'attributeType',
@@ -576,11 +586,11 @@
 
     created() {
       this.getAttriButeList('inventory_type');
+
       // this.getDictList('productionType');
       // this.getZeroPartPros('zeroPartPros');
       this.getContactList();
     },
-    mounted() {},
 
     props: {
       attributeData: {
@@ -643,8 +653,6 @@
     //   }
     // },
 
-    mounted() {},
-
     methods: {
       attributeTypeText(v) {
         if (v) {