695593266@qq.com 7 місяців тому
батько
коміт
eadc8bf0f0

+ 1 - 1
src/views/material/BOMmanage/components/baseInfo.vue

@@ -35,7 +35,7 @@
         </el-col>
         <el-col :span="4" label-width="78px">
           <el-form-item label="版本号:" prop="type">
-            <span v-if="dataInfo.versions.includes('V')">{{
+            <span v-if="dataInfo.versions && dataInfo.versions.includes('V')">{{
               dataInfo.versions
             }}</span>
             <span v-else> V{{ dataInfo.versions }}.0</span>

+ 4 - 1
src/views/material/BOMmanage/components/workmanship.vue

@@ -209,6 +209,10 @@
             type="primary"
             :underline="false"
             icon="el-icon-setting"
+            v-if="
+              attributeData.approvalStatus != 2 &&
+              attributeData.approvalStatus != 1
+            "
             @click="openConfigure(row)"
           >
             配置
@@ -253,7 +257,6 @@
       ref="userEdit"
       :typeList="typeList"
     />
-
   </div>
 </template>
 

+ 2 - 0
src/views/material/BOMmanage/detailsPop.vue

@@ -729,6 +729,8 @@
             }
           } else {
             if (this.versList.length != 0) {
+              this.searchObj.versions =
+                this.versList[this.versList.length - 1].versions;
               this.getTreeData();
             } else {
               this.isNotData = false;

+ 2 - 2
vue.config.js

@@ -35,14 +35,14 @@ module.exports = {
         // target: 'http://192.168.1.105:18086',
         // target: 'http://192.168.1.158:18086',
         // target: 'http://192.168.1.176:18086',
-        // target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.251:18087',
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.251:18086',
 
         // target: 'http://192.168.1.251:18086', // 开发
-        target: 'http://192.168.1.116:18086', // 赵沙金
+        // target: 'http://192.168.1.116:18086', // 赵沙金
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {