LAPTOP-16IUEB3P\Lenovo há 2 anos atrás
pai
commit
0ff14d069a
2 ficheiros alterados com 20 adições e 1 exclusões
  1. 16 1
      src/views/produceOrder/detail.vue
  2. 4 0
      src/views/produceOrder/index.vue

+ 16 - 1
src/views/produceOrder/detail.vue

@@ -102,7 +102,7 @@
                 {{countMsg.joinTotalNum}}PCS
                 {{countMsg.joinTotalNum}}PCS
               </li>
               </li>
             </ul>
             </ul>
-            <ul v-else-if="['烧结', '质检', '深加工'].includes(chooseItem)">
+            <ul v-else-if="['烧结', '质检'].includes(chooseItem)">
               <li>
               <li>
                 <span class="label">累计合格品数量</span>
                 <span class="label">累计合格品数量</span>
                 {{countMsg.standardTotalNum}}PCS
                 {{countMsg.standardTotalNum}}PCS
@@ -148,6 +148,20 @@
                 {{countMsg.joinTotalNum}}PCS
                 {{countMsg.joinTotalNum}}PCS
               </li>
               </li>
             </ul>
             </ul>
+			<ul v-else>
+			  <li>
+				<span class="label">累计合格品数量</span>
+				{{countMsg.standardTotalNum}}PCS
+			  </li>
+			  <li>
+				<span class="label">累计合格品重量</span>
+				{{countMsg.standardTotalWeight}}PCS
+			  </li>
+			  <li>
+				<span class="label">累计投料数量</span>
+				{{countMsg.joinTotalNum}}PCS
+			  </li>
+			</ul>
            <!-- <el-link type="primary" v-if="activeName == 1" @click="openOther"
            <!-- <el-link type="primary" v-if="activeName == 1" @click="openOther"
               >其他任务记录</el-link
               >其他任务记录</el-link
             > -->
             > -->
@@ -1103,6 +1117,7 @@
 			}else{
 			}else{
 				this.tabList = res.taskTypeProcessDiagrams
 				this.tabList = res.taskTypeProcessDiagrams
 			}
 			}
+			this.setData()
 		}
 		}
 		
 		
 		  
 		  

+ 4 - 0
src/views/produceOrder/index.vue

@@ -100,6 +100,7 @@
   import createDialog from './components/createDialog.vue';
   import createDialog from './components/createDialog.vue';
   import unpackDialog from './components/unpackDialog.vue';
   import unpackDialog from './components/unpackDialog.vue';
   import pickingDialog from './components/pickingDialog.vue';
   import pickingDialog from './components/pickingDialog.vue';
+	import { positiveIntegerReg } from 'ele-admin';
   export default {
   export default {
     components: {
     components: {
       produceOrderSearch,
       produceOrderSearch,
@@ -304,6 +305,9 @@
         ];
         ];
       }
       }
     },
     },
+		// created(){
+		// 	 console.log('positiveIntegerReg',positiveIntegerReg)
+		// },
     methods: {
     methods: {
       handlePicking () {
       handlePicking () {
         this.$router.push({
         this.$router.push({