BUG

src/components/material/ChooseMaterial.vue

@@ -33,7 +33,7 @@
           <AssetTree
             @handleNodeClick="handleNodeClick"
             @setRootId="setRootId"
-            id="1"
+            :id="id"
             ref="treeList"
           />
         </el-col>
@@ -67,6 +67,12 @@
     components: {
       AssetTree
     },
+    props: {
+      id: {
+        type: String,
+        default: '1'
+      }
+    },
     data () {
       return {
         materialdialog: false,

src/views/produceOrder/components/report/Package.vue

@@ -12,16 +12,16 @@
       <ul>
         <li> <span class="label">报工次数</span>{{ countMsg.reportNum }}</li>
         <li>
-          <span class="label">累计合格品数量</span
-          >{{ countMsg.standardTotalNum }}PCS</li
+          <span class="label">累计实际数量</span
+          >{{ countMsg.joinTotalNum }}PCS</li
         >
         <li>
-          <span class="label">累计合格品重量</span
-          >{{ countMsg.standardTotalWeight }}KG</li
+          <span class="label">累计包装品数量</span
+          >{{ countMsg.packTotalNum }}PCS</li
         >
         <li>
-          <span class="label">累计投料产品数量</span
-          >{{ countMsg.feedProductWeight }}PCS</li
+          <span class="label">累计包装品产品产品数量</span
+          >{{ countMsg.packProductTotalNum }}PCS</li
         >
       </ul>
       <div class="right">
@@ -148,7 +148,11 @@
         >
       </el-descriptions> -->
     </el-card>
-    <ChooseMaterial ref="ChooseMaterialRef" @success="materialSuccess" />
+    <ChooseMaterial
+      ref="ChooseMaterialRef"
+      id="10"
+      @success="materialSuccess"
+    />
   </el-form>
 </template>
 

src/views/produceOrder/report.vue

@@ -78,7 +78,7 @@
             infoData.completeTime
           }}</el-descriptions-item>
           <el-descriptions-item label="生产周期">{{
-            infoData.ssss
+            infoData.productionCycle
           }}</el-descriptions-item>
         </el-descriptions>
       </el-collapse-transition>

vue.config.js

@@ -31,8 +31,8 @@ module.exports = {
     proxy: {
       // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
-        // target: 'http://192.168.3.51:18086', // 测试
-        target: 'http://192.168.3.35:8080', // kang杨威
+        target: 'http://192.168.3.51:18086', // 测试
+        // target: 'http://192.168.3.35:8080', // kang杨威
         // target: 'http://192.168.3.25:8080', // 黄峥嵘
         // target: 'http://192.168.3.41:8080', // 何江鹏
         // target: 'http://192.168.3.33:8080', // 谢一平