55

src/views/factoryModel/station/components/ProductModal.vue

@@ -187,7 +187,7 @@ export default {
           showOverflowTooltip: true,
           minWidth: 110,
           formatter: (_row) => {
-            return _row.position[0].pathName;
+            return _row.position[0]?.pathName;
           }
         },
         {

src/views/factoryModel/station/index.vue

@@ -50,7 +50,7 @@
           </el-link>
           <el-popconfirm
             class="ele-action"
-            title="确定要删除此角色吗？"
+            title="确定要删除此工位吗？"
             @confirm="remove(row)"
           >
             <template v-slot:reference>

src/views/material/BOMmanage/components/baseInfo.vue

@@ -39,7 +39,7 @@
               size="mini"
               style="width: 120px"
               disabled
-              v-model="dataInfo.status"
+              v-model="dataInfo.approvalStatus"
               placeholder="请选择"
             >
               <el-option
@@ -57,7 +57,7 @@
           <el-button
             type="text"
             @click="handleEdit"
-            v-if="dataInfo.status != 1"
+            v-if="dataInfo.approvalStatus != 1"
           >
             编辑</el-button
           >
@@ -86,16 +86,15 @@
         statusOptions: [
           {
             label: '已停用',
-            value: '2'
+            value: 2
           },
           {
             label: '已发布',
-            value: '1'
+            value: 1
           },
-
           {
             label: '草稿',
-            value: '0'
+            value: 0
           }
         ]
       };
@@ -108,6 +107,7 @@
         }
       }
     },
+    
     methods: {
       handleEdit() {
         this.baseInfoShow = true;

src/views/material/BOMmanage/detailsPop.vue

@@ -50,6 +50,10 @@
               size="mini"
               icon="el-icon-delete"
               @click="remove"
+              v-if="
+                currentNodeData.approvalStatus == 0 ||
+                currentNodeData.approvalStatus == 3
+              "
             >
               删除
             </el-button>
@@ -137,7 +141,7 @@
               type="primary"
               size="mini"
               @click="handleSave"
-              v-if="currentNodeData.status != 1"
+              v-if="currentNodeData.approvalStatus != 1"
             >
               保存
             </el-button>
@@ -637,7 +641,7 @@
       },
 
       handSubmit() {
-        if (this.clientEnvironmentId == 4) {
+        if (this.clientEnvironmentId == 5) {
           this.isSubmit = true;
         } else {
           this.$alert('确定要发布吗?', '提示', {

src/views/material/BOMmanage/index.vue

@@ -212,7 +212,7 @@
 
 
       handSubmit(row) {
-        if (this.clientEnvironmentId == 4) {
+        if (this.clientEnvironmentId == 5) {
           this.JsRId = row.id;
           this.isSubmit = true;
         } else {

vue.config.js

@@ -33,7 +33,7 @@ module.exports = {
       '/api': {
         // target: 'http://192.168.1.124:50001',
         // target: 'http://192.168.1.147:18086',
-        target: 'http://192.168.1.104:18086',
+        target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.176:18086',
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域