首工序

src/views/produceOrder/detail.vue

@@ -98,9 +98,7 @@
         <el-tab-pane label="入库" name="9"></el-tab-pane> -->
       </el-tabs>
       <ele-pro-table
-        :columns="
-          columnOpt[tabList[activeName].taskTypeName] || columnOpt['深加工']
-        "
+        :columns="columns"
         :datasource="datasource"
         :key="activeName"
         :cache-key="`produceDetal${activeName}`"
@@ -109,7 +107,14 @@
       >
         <template v-slot:toolbar>
           <div class="tips-box">
-            <ul v-if="chooseItem == '挤压成型'">
+            <ul
+              v-if="
+                chooseItem == '挤压成型' ||
+                chooseItem.includes('模压') ||
+                chooseItem.includes('挤压') ||
+                (chooseItem.includes('等静压') && activeName == 1)
+              "
+            >
               <li>
                 <span class="label">累计合格品数量</span>
                 {{ countMsg.standardTotalNum }}PCS
@@ -125,7 +130,8 @@
             </ul>
             <ul
               v-else-if="
-                ['自然干燥', '升温干燥', '半加定长'].includes(chooseItem)
+                ['自然干燥', '升温干燥', '半加定长'].includes(chooseItem) ||
+                chooseItem.includes('半加')
               "
             >
               <li>
@@ -1064,6 +1070,27 @@
       this.getInfo(this.workOrderId);
       this.requestDict('仓库');
     },
+    computed: {
+      columns() {
+        const { taskTypeName: name } = this.tabList[this.activeName];
+
+        if (name.includes('半加')) {
+          return this.columnOpt['半加定长'];
+        }
+        if (
+          (name.includes('模压') ||
+            name.includes('挤压') ||
+            name.includes('等静压')) &&
+          this.activeName == 1
+        ) {
+          return this.columnOpt['挤压成型'];
+        }
+        return (
+          this.columnOpt[this.tabList[this.activeName].taskTypeName] ||
+          this.columnOpt['深加工']
+        );
+      }
+    },
     methods: {
       handlePrint() {
         this.$refs.orderPrintRef.open();

src/views/produceOrder/report.vue

@@ -202,6 +202,14 @@
         if (name.includes('半加')) {
           return 'HalfAdded';
         }
+        if (
+          (name.includes('模压') ||
+            name.includes('挤压') ||
+            name.includes('等静压')) &&
+          this.activeName == 1
+        ) {
+          return 'Extrusion';
+        }
         return (
           this.componentsList[this.tabList[this.activeName].name] || 'Common'
         );

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', // 谢一平