2213980799@qq.com 1 ano atrás
pai
commit
3c14d08287

+ 8 - 2
src/views/unacceptedProduct/components/salesToProduction.vue

@@ -63,7 +63,7 @@
                 dictName="余量系数"
                 dictName="余量系数"
                 v-model="form.marginCoefficient"
                 v-model="form.marginCoefficient"
               ></DictSelection> -->
               ></DictSelection> -->
-              <el-select filterable allow-create @change="itemChange">
+              <el-select filterable allow-create @change="itemChange" v-model="form.marginCoefficient">
                 <el-option
                 <el-option
                   v-for="(item, index) in marginList"
                   v-for="(item, index) in marginList"
                   :key="index"
                   :key="index"
@@ -520,6 +520,11 @@ export default {
       type: '',
       type: '',
       teamList: [],
       teamList: [],
       isMoCount: false,
       isMoCount: false,
+      weightList: [
+        { code: 1, name: 'A' },
+        { code: 2, name: 'B' },
+        { code: 3, name: 'C' }
+      ],
       isSlotting: [
       isSlotting: [
         { code: 1, name: '是' },
         { code: 1, name: '是' },
         { code: 2, name: '否' }
         { code: 2, name: '否' }
@@ -538,7 +543,7 @@ export default {
       // 表单验证规则
       // 表单验证规则
       rules: {
       rules: {
         produceRoutingName: [
         produceRoutingName: [
-          { required: true, message: '请选择生产版本', trigger: 'change' }
+          { required: true, message: '请选择工艺路线', trigger: 'change' }
         ]
         ]
       },
       },
       // selection: [],
       // selection: [],
@@ -577,6 +582,7 @@ export default {
 
 
           _arr.push({ name: key, value: value });
           _arr.push({ name: key, value: value });
         });
         });
+        console.log(_arr)
         this.marginList = _arr;
         this.marginList = _arr;
       });
       });
     },
     },

+ 0 - 1
src/views/unacceptedProduct/probationalGoods/index.vue

@@ -64,7 +64,6 @@
 import OrderSearch from '../components/probationalGoods-search.vue';
 import OrderSearch from '../components/probationalGoods-search.vue';
 import SalesToProduction from '../components/salesToProduction.vue';
 import SalesToProduction from '../components/salesToProduction.vue';
 import dictMixins from '@/mixins/dictMixins';
 import dictMixins from '@/mixins/dictMixins';
-import { reworkStatus } from '@/utils/util';
 
 
 import { trialProducts, deleteTrialProducts } from '@/api/unacceptedProduct/index';
 import { trialProducts, deleteTrialProducts } from '@/api/unacceptedProduct/index';
 export default {
 export default {

+ 0 - 1
src/views/unacceptedProduct/refuseManagement/index.vue

@@ -64,7 +64,6 @@
 import OrderSearch from '../components/probationalGoods-search.vue';
 import OrderSearch from '../components/probationalGoods-search.vue';
 import SalesToProduction from '../components/salesToProduction.vue';
 import SalesToProduction from '../components/salesToProduction.vue';
 import dictMixins from '@/mixins/dictMixins';
 import dictMixins from '@/mixins/dictMixins';
-import { reworkStatus } from '@/utils/util';
 
 
 import { scrapProducts, deleteScrapProducts } from '@/api/unacceptedProduct/index';
 import { scrapProducts, deleteScrapProducts } from '@/api/unacceptedProduct/index';
 export default {
 export default {

+ 1 - 1
vue.config.js

@@ -32,7 +32,7 @@ module.exports = {
       // 当我们的本地的请求 有/api的时候,就会代理我们的请求地址向另外一个服务器发出请求
       // 当我们的本地的请求 有/api的时候,就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
       '/api': {
         // target: 'http://124.71.68.31:50001',
         // target: 'http://124.71.68.31:50001',
-        target: 'http://192.168.1.107:20881',
+        target: 'http://192.168.1.107:18086',
 
 
 
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域