ysy 1 an în urmă
părinte
comite
90aa41c7e1

+ 63 - 77
src/views/produce/components/feeding/components/productsBom.vue

@@ -1,105 +1,91 @@
-
 <template>
-<div>
-  <!-- <div v-if="productsObj && productsObj.name != 'undefined' && productsObj.feedQuantity != 'undefined'">
-        <div class="title_box rx-bc mt6">
-            <div class="name">在制品 </div>
+  <div>
+    <div v-if="productsObj && productsObj.name != 'undefined' && productsObj.feedQuantity != 'undefined'">
+      <div class="title_box rx-bc mt6">
+        <div class="name">在制品 </div>
 
-            <div class="rx-bc"> </div>
-        </div>
+        <div class="rx-bc"> </div>
+      </div>
 
-        <div class="material">
-      <div class="content_table">
-        <div class="item rx-sc">
-          <div class="rx ww33">
-            <div class="lable rx-cc">名称</div>
-            <div class="content">
-              {{
-                productsObj.name  + '-在制品'
-              }}
+      <div class="material">
+        <div class="content_table">
+          <div class="item rx-sc">
+            <div class="rx ww33">
+              <div class="lable rx-cc">名称</div>
+              <div class="content">
+                {{
+                  productsObj.name + '-在制品'
+                }}
+              </div>
             </div>
-          </div>
 
-          <div class="rx ww33">
-            <div class="lable rx-cc">牌号</div>
-            <div class="content">{{  productsObj.brandNu }}</div>
-          </div>
+            <div class="rx ww33">
+              <div class="lable rx-cc">牌号</div>
+              <div class="content">{{ productsObj.brandNu }}</div>
+            </div>
 
-          <div class="rx ww33">
-            <div class="lable rx-cc">型号</div>
-            <div class="content">{{ productsObj.modelType  }}</div>
+            <div class="rx ww33">
+              <div class="lable rx-cc">型号</div>
+              <div class="content">{{ productsObj.modelType }}</div>
+            </div>
           </div>
-        </div>
 
-        <div class="item rx-sc">
-          <div class="rx ww33">
-            <div class="lable rx-cc">数量</div>
-            <div class="content rx-sc">
-              <div> {{ productsObj.extInfo.sourceQuantity  || 0  }} {{ productsObj.unit }}</div>
+          <div class="item rx-sc">
+            <div class="rx ww33">
+              <div class="lable rx-cc">数量</div>
+              <div class="content rx-sc">
+                <div> {{ productsObj.extInfo.sourceQuantity || 0 }} {{ productsObj.unit }}</div>
+              </div>
             </div>
-          </div>
 
-         
 
-          <div class="rx ww33">
-            <div class="lable rx-cc">投料数量</div>
-            <div class="content content_num rx-sc">
-              <el-input size="mini" v-model="productsObj.feedQuantity"  type="digit" @input="maxFeedQuantity()" placeholder="请输入投料数量" />
+
+            <div class="rx ww33">
+              <div class="lable rx-cc">投料数量</div>
+              <div class="content content_num rx-sc">
+                <el-input size="mini" v-model="productsObj.feedQuantity" type="digit" @input="maxFeedQuantity()"
+                  placeholder="请输入投料数量" />
+              </div>
             </div>
           </div>
-        </div>
 
-        <div class="del_box">
-          <el-link type="danger" icon="el-icon-delete" @click="getDelete(index)"></el-link>
+          <div class="del_box">
+            <el-link type="danger" icon="el-icon-delete" @click="getDelete(index)"></el-link>
+          </div>
         </div>
       </div>
     </div>
-    </div> -->
-
-  {{ productsObj }}
-  33
   </div>
-
 </template>
 
-
 <script>
 export default {
-    props: {
-      product: {
-          type: Object,
-          default: () => { }
-        },
-
-        itemObj: {
-            type: Object,
-            default: () => { }
-        }
-
+  name: 'productsBom',
+  props: {
+    itemObj: {
+      type: Object,
+      default: () => { }
     },
+    productsObj: {
+      type: Object,
+      default: () => { }
+    }
+  },
 
-    watch: {
-      product: {
-        immediate: true,
-        handler(newVal) {
-          console.log(newVal)
-          this.productsObj = newVal
-          this.$forceUpdate()
-        },
-        deep: true
-        
-    },
+  computed: {},
 
-    created() {
-      console.log()
-    },
+  data() {
+    return {};
+  },
 
-    methods: {
-        maxFeedQuantity() {
-            // if (this.productsObj.feedQuantity > this.itemObj.formingNum) {
-            //     this.$set(this.productsObj, 'feedQuantity', this.itemObj.formingNum)
-            // }
-        }
+  methods: {
+    maxFeedQuantity() {
+      if (this.productsObj.feedQuantity > this.itemObj.formingNum) {
+        this.$set(this.productsObj, 'feedQuantity', this.itemObj.formingNum)
+      }
     }
+  }
+};
+</script>
 
-}
+<style scoped lang="scss"></style>

+ 8 - 4
src/views/produce/components/feeding/index.vue

@@ -12,7 +12,7 @@
       >
     </div>
 
-    <div class="feed_box">
+    <div class="feed_box"  v-if="isLoad">
       <div v-for="(item, index) in List" :key="index" class="card_box">
         <div class="title_box rx-bc">
           <div class="name">工单信息 </div>
@@ -37,7 +37,7 @@
           </div>
         </div>
 
-        <workOrderBom :item="item"></workOrderBom>
+        <workOrderBom :item="item" ></workOrderBom>
 
         <paramBom
           v-if="item.paramDetailList.length != 0"
@@ -53,7 +53,8 @@
         <productsBom
           v-if="item.product != null && item.product != '{}'"
           :itemObj="item"
-          :product="item.product"
+
+          :productsObj="item.product"
         >
         </productsBom>
 
@@ -174,7 +175,8 @@
     data() {
       return {
         List: [],
-        idsList: []
+        idsList: [],
+        isLoad: false,
       };
     },
 
@@ -185,6 +187,7 @@
           ids: ids,
           taskId: this.taskObj.id
         };
+        this.isLoad = false;
         workorderList(param)
           .then((res) => {
             let arr = [];
@@ -246,6 +249,7 @@
             this.List = deepClone(arr);
           })
           .finally(() => {
+            this.isLoad = true;
             this.getCacheFn();
           });