Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-mes into dev

src/views/produceOrder/detail.vue

@@ -151,7 +151,7 @@
                 {{ countMsg.joinTotalNum }}PCS
               </li>
             </ul>
-            <ul v-else-if="['烧结', '质检', '深加工'].includes(chooseItem)">
+            <ul v-else-if="['烧结', '质检'].includes(chooseItem)">
               <li>
                 <span class="label">累计合格品数量</span>
                 {{ countMsg.standardTotalNum }}PCS
@@ -197,6 +197,20 @@
                 {{ countMsg.joinTotalNum }}PCS
               </li>
             </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
             > -->
@@ -1040,9 +1054,6 @@
       this.getInfo(this.workOrderId);
     },
     methods: {
-      handlePrint () {
-        this.$refs.orderPrintRef.open();
-      },
       handleTabClick (tab) {
         if (this.chooseIndex != tab.index) {
           this.chooseIndex = Number(tab.index);
@@ -1199,6 +1210,7 @@
         } else {
           this.tabList = res.taskTypeProcessDiagrams;
         }
+		this.setData();
       }
     }
   };

src/views/produceOrder/index.vue

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