55

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

@@ -248,9 +248,11 @@
       chooseStandardList(type, data) {
         if (type == 9 || type == 1) {
           this.category = data[0];
+          console.log(999,    this.category )
           this.attributeData.categoryId = data[0].id;
           this.$set(this.attributeData, 'code', data[0].code);
           this.$set(this.attributeData, 'name', data[0].name);
+          this.$set(this.attributeData, 'unit', data[0].measuringUnit);
           this.$forceUpdate();
         }
       },

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

@@ -999,7 +999,14 @@
         currentIndex: 0,
         tableData: {},
         beatParam: {
-          
+            newTime: '',
+            time: '',
+              newBeatPrepareTime:'',
+              beatPrepareTime:  '',
+              newBeatTime: '',
+              beatTime: '',
+              newBeatRestTime: '',
+              beatRestTime: '',
         },
 
         qualityParam: [],

src/views/material/BOMmanage/detailsPop.vue

@@ -10,7 +10,7 @@
       <!-- 自定义头部 -->
       <div class="custom-drawer-header" v-if="!isWt">
         <div class="radio_box rx-cc">
-   
+           {{  clientEnvironmentId }}
           <el-radio-group
             size="small"
             v-model="currentNodeData.bomType"
@@ -440,8 +440,7 @@
 
     computed: {
       clientEnvironmentId() {
-        // return this.$store.state.user.info.clientEnvironmentId;
-        return 2
+        return this.$store.state.user.info.clientEnvironmentId;
       }
     },
 
@@ -529,6 +528,9 @@
         if (id) {
           getBomGetById(id).then((res) => {
             this.currentNodeData = res.data;
+            if(this.clientEnvironmentId == 2) {
+              this.currentNodeData.bomType = 2;
+            }
             this.searchObj.versions = this.currentNodeData.versions;
             this.$forceUpdate();
           });

vue.config.js

@@ -31,11 +31,10 @@ module.exports = {
     proxy: {
       // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
-        target: 'http://192.168.1.125:18086',
-        // target: 'http://192.168.1.147:18086',
+        // target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.176:18086',
 
-
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''