chencc 1 год назад
Родитель
Сommit
384315beaf
2 измененных файлов с 46 добавлено и 31 удалено
  1. 44 29
      src/views/material/product/detail.vue
  2. 2 2
      vue.config.js

+ 44 - 29
src/views/material/product/detail.vue

@@ -59,7 +59,7 @@
             </div>
 
           </el-col>
-          
+
 
           <el-col :span="8">
             <!-- v-if="
@@ -166,20 +166,16 @@
           <el-col :span="8">
             <el-form-item label="状态">
               <template>
-          
-          <el-switch
-                v-model="form.isEnabled"
-                   :active-text="form.isEnabled==1?'启用':'停用'"
-                   :active-value="1"
-                   :inactive-value="0"
-                >
-            </el-switch>
-           
-          
+
+                <el-switch v-model="form.isEnabled" :active-text="form.isEnabled == 1 ? '启用' : '停用'" :active-value="1"
+                  :inactive-value="0">
+                </el-switch>
+
+
               </template>
             </el-form-item>
           </el-col>
-       
+
           <el-col :span="8" v-for="(f, idx) in fileList" :key="idx">
             <el-form-item :label="f.label">
               <template>
@@ -332,10 +328,26 @@ export default {
         attributeType: 1,
         weightUnit: '',
         packingUnit: '',
-        isEnabled:1,
+        isEnabled: 1,
         extField: {}
       },
-      lbjtList:[],
+      lbjtList: [
+        {
+          label: '自制件',
+          value: 1
+        },
+        {
+          label: '采购件',
+          value: 2
+        },
+        {
+          label: '外协件',
+          value: 3
+        }, {
+          label: '受托件',
+          value: 4
+        }
+      ],
       attributeList: [
         {
           label: '总装',
@@ -379,11 +391,11 @@ export default {
 
       dictList: [
         {
-          label: '自制件',
+          label: '加工',
           value: 1
         },
         {
-          label: '装配',
+          label: '装配',
           value: 3
         },
       ],
@@ -438,16 +450,16 @@ export default {
         if (id) {
           this._getDetails();
         } else {
-          let { lyType} = this.$route.query;
+          let { lyType } = this.$route.query;
 
           let arrId = '';
-          if(lyType=="wp"){
+          if (lyType == "wp") {
             arrId = 3
           }
-          if(lyType=="cp"){
+          if (lyType == "cp") {
             arrId = 1
           }
-          
+
           this.form = {
             categoryLevelGroupName: '',
             // categoryLevelName: '',
@@ -467,7 +479,7 @@ export default {
             remarkAttach: []
           };
           this.categoryAps = {};
-          this.categoryMes = { productionDays: '20',isCompleteSet:0,isModify:0,isRework:0,isRematerial:0,isByProduct:0,isWaste:0,isDefective:0 };
+          this.categoryMes = { productionDays: '20', isCompleteSet: 0, isModify: 0, isRework: 0, isRematerial: 0, isByProduct: 0, isWaste: 0, isDefective: 0 };
           this.categoryMold = {};
           this.categoryPallet = {};
           this.categoryQms = {};
@@ -508,7 +520,7 @@ export default {
 
     this.getFieldModel();
 
-    this.getDictList('zeroPartPros');
+    // this.getDictList('zeroPartPros');
   },
   async created() {
     //新增
@@ -759,13 +771,16 @@ export default {
 
     async getDictList(code) {
       let { data: res } = await getByCode(code);
-      this.lbjtList = res.map((item) => {
-        let values = Object.keys(item);
-        return {
-          value: Number(values[0]),
-          label: item[values[0]]
-        };
-      });
+
+      console.log('res----', res);
+
+      // this.lbjtList = res.map((item) => {
+      //   let values = Object.keys(item);
+      //   return {
+      //     value: Number(values[0]),
+      //     label: item[values[0]]
+      //   };
+      // });
     },
 
     openCategory() {

+ 2 - 2
vue.config.js

@@ -36,10 +36,10 @@ module.exports = {
     proxy: {
       // 当我们的本地的请求 有/api的时候,就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
-        // target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.125: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.251:18086',
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {