优化

src/api/produce/workOrder.js

@@ -34,6 +34,30 @@ export async function pageeLedgerMain(data) {
   return Promise.reject(new Error(res.data.message));
 }
 
+// 资产
+export async function assetPage(data) {
+  const res = await request.get('/main/asset/pdaPage', {
+    params: data
+  });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 在制品
+export async function listInProduct(data) {
+  const res = await request.post('/pda/mes/feed/listInProduct', data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+
+
+
+
 
 // 父级ID查询分类树
 export async function treeByPid(data) {

src/views/produce/components/feeding/components/instanceBom.vue

@@ -1,126 +1,134 @@
 <template>
-    <div>
-        <div class="title_box rx-bc mt6">
-            <div class="name">物料清单 </div>
+  <div>
+    <div class="title_box rx-bc mt6">
+      <div class="name">物料清单 </div>
 
-            <div class="rx-bc"> </div>
-        </div>
-
-        <div class="material">
-            <div class="content_table mb4" v-for="(item, index) in list" :key="index">
-                <div class="item rx-sc">
-                    <div class="rx ww33">
-                        <div class="lable rx-cc">编码</div>
-                        <div class="content">
-                            {{ item.code }}
-                        </div>
-                    </div>
-
-                    <div class="rx ww33">
-                        <div class="lable rx-cc">名称</div>
-                        <div class="content">{{ item.name }}</div>
-                    </div>
-
-                    <div class="rx ww33">
-                        <div class="lable rx-cc">型号</div>
-                        <div class="content">{{ item.modelType }}</div>
-                    </div>
-                </div>
-
-                <div class="item rx-sc">
-                    <div class="rx ww33">
-                        <div class="lable rx-cc">规格</div>
-                        <div class="content rx-sc">
-                            <div>{{ item.specification }}</div>
-                        </div>
-                    </div>
-
-                    <div class="rx ww33">
-                        <div class="lable rx-cc">牌号</div>
-                        <div class="content rx-sc">
-                            <div>{{ item.brandNum }}</div>
-                        </div>
-                    </div>
-
-                    <div class="rx ww33">
-                        <div class="lable rx-cc">包装库存</div>
-                        <div class="content rx-sc">
-                            <div>{{ item.packingCountBase }}/ {{ item.minUnit }}</div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="item rx-sc">
-                    <div class="rx ww33" v-if="item.isConsumable == 1">
-                        <div class="lable rx-cc">数量</div>
-                        <div class="content content_num rx-sc">
-                            <el-input size="mini" v-model="item.feedQuantity" placeholder="数量">
-
-                            </el-input>
-                        </div>
-                    </div>
+      <div class="rx-bc"> </div>
+    </div>
 
-                    <div class="rx ww33" v-if="item.isConsumable == 0">
-                        <div class="lable rx-cc">>{{ currentTaskDiagram.isFirstTask == 1 ? '物料重量': '上道重量' }}</div>
-                        <div class="content" v-if="currentTaskDiagram.isFirstTask == 1" >	{{item.extInfo.weight || 0}} {{ item.extInfo.weightUnit}}</div>
-                        <div class="content" v-if="currentTaskDiagram.isFirstTask == 0" >	{{item.extInfo.newWeight || 0}} {{ item.extInfo.weightUnit}}</div>
-                    </div>
+    <div class="material">
+      <div class="content_table mb4" v-for="(item, index) in list" :key="index">
+        <div class="item rx-sc">
+          <div class="rx ww33">
+            <div class="lable rx-cc">编码</div>
+            <div class="content">
+              {{ item.code }}
+            </div>
+          </div>
 
-                    
-                    <div class="rx ww33" v-if="item.isConsumable == 0">
-                        <div class="lable rx-cc">刻码</div>
-                        <div class="content">{{ item.extInfo.engrave }}</div>
-                    </div>
+          <div class="rx ww33">
+            <div class="lable rx-cc">名称</div>
+            <div class="content">{{ item.name }}</div>
+          </div>
 
-                      
-                    <div class="rx ww33" v-if="item.isConsumable == 0">
-                        <div class="lable rx-cc">物料代号</div>
-                        <div class="content">{{ item.extInfo.materielCode }}</div>
-                    </div>
+          <div class="rx ww33">
+            <div class="lable rx-cc">型号</div>
+            <div class="content">{{ item.modelType }}</div>
+          </div>
+        </div>
 
+        <div class="item rx-sc">
+          <div class="rx ww33">
+            <div class="lable rx-cc">规格</div>
+            <div class="content rx-sc">
+              <div>{{ item.specification }}</div>
+            </div>
+          </div>
 
+          <div class="rx ww33">
+            <div class="lable rx-cc">牌号</div>
+            <div class="content rx-sc">
+              <div>{{ item.brandNum }}</div>
+            </div>
+          </div>
 
-                </div>
-      
+          <div class="rx ww33">
+            <div class="lable rx-cc">包装库存</div>
+            <div class="content rx-sc">
+              <div>{{ item.packingCountBase }}/ {{ item.minUnit }}</div>
+            </div>
+          </div>
+        </div>
 
-            <div class="del_box">
-                <el-link type="danger" icon="el-icon-delete" @click="getDelete(index)"></el-link>
+        <div class="item rx-sc">
+          <div class="rx ww33" v-if="item.isConsumable == 1">
+            <div class="lable rx-cc">数量</div>
+            <div class="content content_num rx-sc">
+              <el-input
+                size="mini"
+                v-model="item.feedQuantity"
+                placeholder="数量"
+              >
+              </el-input>
             </div>
+          </div>
+
+          <div class="rx ww33" v-if="item.isConsumable == 0">
+            <div class="lable rx-cc">{{
+              currentTaskDiagram.isFirstTask == 1 ? '物料重量' : '上道重量'
+            }}</div>
+            <div class="content" v-if="currentTaskDiagram.isFirstTask == 1">
+              {{ item.extInfo.weight || 0 }} {{ item.extInfo.weightUnit }}</div
+            >
+            <div class="content" v-if="currentTaskDiagram.isFirstTask == 0">
+              {{ item.extInfo.newWeight || 0 }}
+              {{ item.extInfo.weightUnit   }}</div
+            >
+          </div>
+
+          <div class="rx ww33" v-if="item.isConsumable == 0">
+            <div class="lable rx-cc">刻码</div>
+            <div class="content">{{ item.extInfo.engrave }}</div>
+          </div>
+
+          <div class="rx ww33" v-if="item.isConsumable == 0">
+            <div class="lable rx-cc">物料代号</div>
+            <div class="content">{{ item.extInfo.materielCode }}</div>
+          </div>
         </div>
+
+        <div class="del_box">
+          <el-link
+            type="danger"
+            icon="el-icon-delete"
+            @click="getDelete(index)"
+          ></el-link>
+        </div>
+      </div>
     </div>
-    </div>
+  </div>
 </template>
 <script>
-export default {
+  export default {
     props: {
-        list: {
-            type: Array,
-            default: () => []
-        },
-        equipmentList: {
-            type: Array,
-            default: () => []
-        },
-
-        currentTaskDiagram: {
-            type: Object,
-            default: () => { }
-        },
-        isDetails: {
-            type: Boolean,
-            default: false
-        }
+      list: {
+        type: Array,
+        default: () => []
+      },
+      equipmentList: {
+        type: Array,
+        default: () => []
+      },
+
+      currentTaskDiagram: {
+        type: Object,
+        default: () => {}
+      },
+      isDetails: {
+        type: Boolean,
+        default: false
+      }
     },
     methods: {
-        getDelete(index) {
-            this.list.splice(index, 1);
-        }
+      getDelete(index) {
+        this.list.splice(index, 1);
+      }
     }
-};
+  };
 </script>
 
 <style lang="scss" scoped>
-.mb4 {
+  .mb4 {
     margin-bottom: 4px;
-}
+  }
 </style>

src/views/produce/components/picking/pickingList.vue

@@ -143,7 +143,7 @@
 <script>
   import AssetTree from '../../components/assetTree.vue';
   import pickingListSearch from './pickingListSearch.vue';
-  import { pageeLedgerMain } from '@/api/produce/workOrder';
+  import { pageeLedgerMain, assetPage } from '@/api/produce/workOrder';
 
   export default {
     components: { AssetTree, pickingListSearch },
@@ -380,16 +380,34 @@
     methods: {
       /* 表格数据源 */
       datasource({ page, where, limit }) {
-        let URL = pageeLedgerMain;
+        let URL;
+
+        let param = {
+          ...where,
+          pageNum: page,
+          size: limit,
+          categoryLevelId: this.categoryLevelId
+        };
+        if (this.isType == 'pick') {
+          param.dimension = 1;
+          URL = pageeLedgerMain;
+        } else if (this.isType == 'feed') {
+          if ([4, 7, 14].includes(Number(this.rootCategoryLevelId))) {
+            URL = assetPage;
+          } else if (this.rootCategoryLevelId == 2) {
+            param.workOrderId = this.id;
+            delete param.taskId;
+            delete param.categoryLevelId;
+            URL = listInProduct;
+          } else if (
+            ![2, 4, 7, 14].includes(Number(this.rootCategoryLevelId))
+          ) {
+            URL = assetPage;
+          }
+        }
 
         if (this.isCategory) {
-          return URL({
-            ...where,
-            pageNum: page,
-            size: limit,
-            categoryLevelId: this.categoryLevelId,
-            dimension: 1
-          });
+          return URL(param);
         } else {
           return URL({
             ...where,
@@ -475,8 +493,8 @@
         this.treeIds = '1, 5, 7, 8, 10, 13, 14, 23, 26, 9, 28';
       } else if (this.isType == 'feed') {
         this.treeIds = '1, 2, 4, 5, 7, 8, 10, 11, 13, 14, 26, 9, 28';
-      } else if(this.isType == 'job') {
-        this.treeIds = '4, 7'
+      } else if (this.isType == 'job') {
+        this.treeIds = '4, 7';
       }
     }
   };