695593266@qq.com 10 miesięcy temu
rodzic
commit
7dc6b8d180

+ 6 - 6
src/views/material/BOMmanage/components/detailedList.vue

@@ -129,11 +129,12 @@
       </template>
 
       <template v-slot:resourceBomVersion="{ row }">
-        <!-- <div>
+        <div>
           <el-select
             v-model="row.resourceBomVersion"
             class="ele-block"
             size="mini"
+            :disabled="row.approvalStatus == 2 || row.approvalStatus == 1"
             @change="resourceBomVersionFn($event, row)"
           >
             <el-option
@@ -143,8 +144,8 @@
               :label="'V' + item.versions + '.0'"
             ></el-option>
           </el-select>
-        </div> -->
-        <div v-if="!row.id">
+        </div>
+        <!-- <div v-if="!row.id">
           <el-select
             v-model="row.resourceBomVersion"
             disabled
@@ -163,7 +164,7 @@
 
         <div v-else-if="row.resourceBomVersion">
           {{ 'V' + row.resourceBomVersion + '.0' }}
-        </div>
+        </div> -->
       </template>
 
       <template v-slot:materielDesignation="{ row }">
@@ -895,10 +896,9 @@
 
       resourceBomVersionFn(e, row) {
         let arr = row.resourceBomVersionList.find((item) => item.versions == e);
-        console.log(arr, 'eeeeeeeeee');
-        this.$forceUpdate();
         row.resourceBomVersion = arr.versions;
         row.resourceBomId = arr.resourceBomId;
+        this.$forceUpdate();
         console.log(row);
       },
 

+ 2 - 2
vue.config.js

@@ -35,8 +35,8 @@ 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.251:18086',
-        // target: 'http://192.168.1.125:18086',
+        // target: 'http://192.168.1.251:18086',
+        target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.251:18186',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域