Преглед на файлове

新增工序报工是否需要检查首件两检和BOM编辑的时候版本传参错误

695593266@qq.com преди 6 месеца
родител
ревизия
c58a459b6f
променени са 3 файла, в които са добавени 21 реда и са изтрити 3 реда
  1. 4 0
      src/views/material/BOMmanage/components/baseInfoSave.vue
  2. 14 0
      src/views/technology/production/components/user-edit.vue
  3. 3 3
      vue.config.js

+ 4 - 0
src/views/material/BOMmanage/components/baseInfoSave.vue

@@ -177,6 +177,10 @@
               if (!isHas) return;
             }
 
+            this.formData.versions = this.formData.versions
+              .replace(/^V/, '')
+              .split('.')[0];
+
             let param = {
               ...this.formData,
               categoryId: this.categoryId,

+ 14 - 0
src/views/technology/production/components/user-edit.vue

@@ -547,6 +547,19 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="工序报工是否需要首件两检:" label-width="200px">
+            <el-radio-group v-model="form.isFirstArticleDualInspection">
+              <el-radio
+                :label="item.value"
+                v-for="(item, i) in radioList"
+                :key="i"
+                >{{ item.name }}</el-radio
+              >
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
 
@@ -618,6 +631,7 @@
           isFeedCheckProduction: '',
           isPostCheckProduction: '',
           isFinalCheckProduction: '',
+          isFirstArticleDualInspection: '',
           sort: null,
           intervalTime: {
             nextShortPreTime: '', // 时间单位转换后的下一个短周期的时间,格式为YYYY-MM-DDTHH'

+ 3 - 3
vue.config.js

@@ -32,10 +32,10 @@ module.exports = {
     proxy: {
       // 当我们的本地的请求 有/api的时候,就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
-        target: 'http://192.168.1.3:18086',
+        // target: 'http://192.168.1.3: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.125:18086',
         // target: 'http://192.168.1.251:18186',
@@ -45,7 +45,7 @@ module.exports = {
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.11:18086', // 开发
-        // target: 'http://192.168.1.116:18086', // 赵沙金
+        target: 'http://192.168.1.116:18086', // 赵沙金
         // target: 'http://aiot.zoomwin.com.cn:51001/api',
         // target: 'http://f222326r53.imwork.net',