Procházet zdrojové kódy

物料管理编辑完成

LAPTOP-16IUEB3P\Lenovo před 2 roky
rodič
revize
f156382e42

+ 11 - 1
src/enum/dict.js

@@ -31,4 +31,14 @@ export default {
   分类层级: 'bom_level'
 };
 
-export const numberList = ['capacity_cycle', 'target_unit', 'capacity_status'];
+export const numberList = [
+  'capacity_cycle',
+  'target_unit',
+  'capacity_status',
+  'date_unit',
+  'quality_assurance',
+  'schedule_type',
+  'leadtime_unit',
+  'inspection_scheme',
+  'angle', 
+];

+ 10 - 10
src/views/material/manage/components/BoatInfo.vue

@@ -10,33 +10,33 @@
          </div>
          <el-row :gutter="24">
            <el-col :span="8">
-             <el-form-item label="槽数" prop="fixedNum">
-                <el-input  v-model="form.fixedNum"/>
+             <el-form-item label="槽数" prop="slotNum">
+                <el-input  v-model="form.slotNum"/>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="角度" prop="lossRate">
-                <DictSelection dictName="角度" clearable v-model="form.scheduleType">
+             <el-form-item label="角度" prop="angle">
+                <DictSelection dictName="角度" clearable v-model="form.angle">
                 </DictSelection>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="长" prop="fixedNum">
-                <el-input v-model="form.lossRate">
+             <el-form-item label="长" prop="palletLen">
+                <el-input v-model="form.palletLen">
                     <template slot="append">mm</template>
                 </el-input>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="宽" prop="consumeWave">
-                <el-input v-model="form.lossRate">
+             <el-form-item label="宽" prop="wilde">
+                <el-input v-model="form.wilde">
                     <template slot="append">mm</template>
                 </el-input>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="高" prop="consumeWave">
-                <el-input v-model="form.lossRate">
+             <el-form-item label="高" prop="hight">
+                <el-input v-model="form.hight">
                     <template slot="append">mm</template>
                 </el-input>
              </el-form-item>

+ 15 - 15
src/views/material/manage/components/MoldInfo.vue

@@ -10,46 +10,46 @@
          </div>
          <el-row :gutter="24">
            <el-col :span="8">
-             <el-form-item label="收缩系数" prop="fixedNum">
-                <el-input  v-model="form.fixedNum"/>
+             <el-form-item label="收缩系数" prop="shrinkEffictive">
+                <el-input  v-model="form.shrinkEffictive"/>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="芯杆数量" prop="lossRate">
-                <el-input  v-model="form.fixedNum"/>
+             <el-form-item label="芯杆数量" prop="coreBarNum">
+                <el-input  v-model="form.coreBarNum"/>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="模孔数量" prop="fixedNum">
-                <el-input v-model="form.lossRate">
+             <el-form-item label="模孔数量" prop="dieHoleNum">
+                <el-input v-model="form.dieHoleNum">
                 </el-input>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="上冲头数量" prop="consumeWave">
-                <el-input v-model="form.lossRate">
+             <el-form-item label="上冲头数量" prop="upperPunchNum">
+                <el-input v-model="form.upperPunchNum">
                 </el-input>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="下冲头数量" prop="consumeWave">
-                <el-input v-model="form.lossRate">
+             <el-form-item label="下冲头数量" prop="downPunchNum">
+                <el-input v-model="form.downPunchNum">
                 </el-input>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="最大冲压次数" prop="consumeWave">
-                <el-input v-model="form.lossRate">
+             <el-form-item label="最大冲压次数" prop="maxCyTimes">
+                <el-input v-model="form.maxCyTimes">
                 </el-input>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="大模体型号" prop="consumeWave">
-                <el-input v-model="form.lossRate">
+             <el-form-item label="大模体型号" prop="maxMoldType">
+                <el-input v-model="form.maxMoldType">
                 </el-input>
              </el-form-item>
            </el-col>
-           
+
          </el-row>
       </el-form>
   </div>

+ 12 - 12
src/views/material/manage/components/PlanInfo.vue

@@ -10,36 +10,36 @@
          </div>
          <el-row :gutter="24">
            <el-col :span="8">
-             <el-form-item label="固定提前期" prop="fixedNum">
-                <el-input  v-model="form.fixedNum"/>
+             <el-form-item label="固定提前期" prop="fixLeadTime">
+                <el-input  v-model="form.fixLeadTime"/>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="变动提前期" prop="fixedNum">
-                <el-input  v-model="form.fixedNum"/>
+             <el-form-item label="变动提前期" prop="changeLeadTime">
+                <el-input  v-model="form.changeLeadTime"/>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="检验提前期" prop="fixedNum">
-                <el-input  v-model="form.fixedNum"/>
+             <el-form-item label="检验提前期" prop="checkLeadTime">
+                <el-input  v-model="form.checkLeadTime"/>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="累计提前期" prop="consumeWave">
-                <el-input  v-model="form.fixedNum"/>
+             <el-form-item label="累计提前期" prop="cumLeadTime">
+                <el-input  v-model="form.cumLeadTime"/>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="提前期单位" prop="lossRate">
-                <DictSelection dictName="提前期单位" clearable v-model="form.scheduleType">
+             <el-form-item label="提前期单位" prop="unit">
+                <DictSelection dictName="提前期单位" clearable v-model="form.unit">
                 </DictSelection>
              </el-form-item>
            </el-col>
            <el-col :span="8">
              <el-form-item label="订货间隔期" prop="scheduleType">
                 <div class="form-line">
-                  <el-input  v-model="form.date"/>
-                  <DictSelection class="line-select" dictName="提前期单位" clearable v-model="form.dateUnit">
+                  <el-input  v-model="form.orderIntervalTime"/>
+                  <DictSelection class="line-select" dictName="提前期单位" clearable v-model="form.orderIntervalUnit">
                   </DictSelection>
                 </div>
              </el-form-item>

+ 25 - 25
src/views/material/manage/components/ProductionInfo.vue

@@ -11,69 +11,69 @@
          <el-row :gutter="24">
            <el-col :span="8">
              <el-form-item label="是否齐套件">
-                <el-radio v-model="form.isComplete" label="1">是</el-radio>
-                <el-radio v-model="form.isComplete" label="0">否</el-radio>
+                <el-radio v-model="form.isCompleteSet" :label="1">是</el-radio>
+                <el-radio v-model="form.isCompleteSet" :label="0">否</el-radio>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="消耗波动" prop="consumeWave">
-                <el-input v-model="form.consumeWave">
+             <el-form-item label="消耗波动" prop="consumWave">
+                <el-input v-model="form.consumWave">
                     <template slot="append">%</template>
                 </el-input>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="变动损耗率" prop="lossRate">
-                <el-input v-model="form.lossRate">
+             <el-form-item label="变动损耗率" prop="changeLossRate">
+                <el-input v-model="form.changeLossRate">
                     <template slot="append">%</template>
                 </el-input>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="固定损耗数" prop="fixedNum">
-                <el-input  v-model="form.fixedNum"/>
+             <el-form-item label="固定损耗数" prop="fixLossNum">
+                <el-input  v-model="form.fixLossNum"/>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="排程类型" prop="scheduleType">
-                <DictSelection dictName="排程类型" clearable v-model="form.scheduleType">
+             <el-form-item label="排程类型" prop="apsType">
+                <DictSelection dictName="排程类型" clearable v-model="form.apsType">
                 </DictSelection>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="允许改型" prop="isAllow">
-               <el-radio v-model="form.isAllow" label="1">是</el-radio>
-               <el-radio v-model="form.isAllow" label="0">否</el-radio>
+             <el-form-item label="允许改型" prop="isModify">
+               <el-radio v-model="form.isModify" :label="1">是</el-radio>
+               <el-radio v-model="form.isModify" :label="0">否</el-radio>
              </el-form-item>
            </el-col>
            <el-col :span="8">
              <el-form-item label="允许返工返修" prop="isRework">
-               <el-radio v-model="form.isRework" label="1">是</el-radio>
-               <el-radio v-model="form.isRework" label="0">否</el-radio>
+               <el-radio v-model="form.isRework" :label="1">是</el-radio>
+               <el-radio v-model="form.isRework" :label="0">否</el-radio>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="是否返回料" prop="isReturnMaterial">
-               <el-radio v-model="form.isReturnMaterial" label="1">是</el-radio>
-               <el-radio v-model="form.isReturnMaterial" label="0">否</el-radio>
+             <el-form-item label="是否返回料" prop="isRematerial">
+               <el-radio v-model="form.isRematerial" :label="1">是</el-radio>
+               <el-radio v-model="form.isRematerial" :label="0">否</el-radio>
              </el-form-item>
            </el-col>
            <el-col :span="8">
              <el-form-item label="是否副产品" prop="isByProduct">
-               <el-radio v-model="form.isByProduct" label="1">是</el-radio>
-               <el-radio v-model="form.isByProduct" label="0">否</el-radio>
+               <el-radio v-model="form.isByProduct" :label="1">是</el-radio>
+               <el-radio v-model="form.isByProduct" :label="0">否</el-radio>
              </el-form-item>
            </el-col>
            <el-col :span="8">
              <el-form-item label="是否废品" prop="isWaste">
-               <el-radio v-model="form.isWaste" label="1">是</el-radio>
-               <el-radio v-model="form.isWaste" label="0">否</el-radio>
+               <el-radio v-model="form.isWaste" :label="1">是</el-radio>
+               <el-radio v-model="form.isWaste" :label="0">否</el-radio>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="是否不良品" prop="isNotGood">
-               <el-radio v-model="form.isNotGood" label="1">是</el-radio>
-               <el-radio v-model="form.isNotGood" label="0">否</el-radio>
+             <el-form-item label="是否不良品" prop="isDefective">
+               <el-radio v-model="form.isDefective" :label="1">是</el-radio>
+               <el-radio v-model="form.isDefective" :label="0">否</el-radio>
              </el-form-item>
            </el-col>
          </el-row>

+ 19 - 12
src/views/material/manage/components/QualityInfo.vue

@@ -10,27 +10,27 @@
          </div>
          <el-row :gutter="24">
            <el-col :span="8">
-             <el-form-item label="是否来料检验" prop="isCheckout">
-                 <el-radio v-model="form.isCheckout" label="1">是</el-radio>
-                 <el-radio v-model="form.isCheckout" label="0">否</el-radio>
+             <el-form-item label="是否来料检验" prop="isComeCheck">
+                 <el-radio v-model="form.isComeCheck" :label="1">是</el-radio>
+                 <el-radio v-model="form.isComeCheck" :label="0">否</el-radio>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="检验方案" prop="lossRate">
-                <DictSelection dictName="检验方案" clearable v-model="form.scheduleType">
+             <el-form-item label="检验方案" prop="checkFormula">
+                <DictSelection dictName="检验方案" clearable v-model="form.checkFormula">
                 </DictSelection>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="采购组织" prop="procureGroup">
-               <deptSelect v-model="form.procureGroup" @changeGroup="searchDeptNodeClick"/>
+             <el-form-item label="采购组织" prop="checkDepart">
+               <deptSelect v-model="form.checkDepart" @changeGroup="searchDeptNodeClick"/>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="采购员" prop="purchaserId">
+             <el-form-item label="采购员" prop="checkPerson">
                <personSelect
                  ref="directorRef"
-                 v-model="form.purchaserId"
+                 v-model="form.checkPerson"
                  @selfChange="handleDirectorChange"
                  :init="false"
                />
@@ -54,11 +54,18 @@
     components: { deptSelect , personSelect },
     data() {
       return {
-
-
       };
     },
-
+    watch: {
+      form(data) {
+        if (data.checkDepart) {
+           const params = { executeGroupId: data.checkDepart };
+            this.$nextTick(() => {
+              this.$refs.directorRef.getList(params);
+            });
+        }
+      }
+    },
     methods: {
       // 选择所属部门
       searchDeptNodeClick (id, info) {

+ 2 - 2
src/views/material/manage/components/RemarkInfo.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="other">
-    <!-- <el-form label-width="120px"  ref="form" :model="form">
+    <el-form label-width="120px"  ref="form" :model="form">
          <div class="divider">
            <div class="title">
              <div class="ele-bg-primary"></div>
@@ -20,7 +20,7 @@
              </el-form-item>
            </el-col>
          </el-row>
-      </el-form> -->
+      </el-form>
   </div>
 </template>
 

+ 10 - 10
src/views/material/manage/components/TurnoverInfo.vue

@@ -10,32 +10,32 @@
          </div>
          <el-row :gutter="24">
            <el-col :span="8">
-             <el-form-item label="层数" prop="fixedNum">
-                <el-input  v-model="form.fixedNum"/>
+             <el-form-item label="层数" prop="levelNum">
+                <el-input  v-model="form.levelNum"/>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="材质" prop="lossRate">
-                <el-input  v-model="form.fixedNum"/>
+             <el-form-item label="材质" prop="materialQuality">
+                <el-input  v-model="form.materialQuality"/>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="长" prop="fixedNum">
-                <el-input v-model="form.lossRate">
+             <el-form-item label="长" prop="vehicleLen">
+                <el-input v-model="form.vehicleLen">
                     <template slot="append">mm</template>
                 </el-input>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="宽" prop="consumeWave">
-                <el-input v-model="form.lossRate">
+             <el-form-item label="宽" prop="wilde">
+                <el-input v-model="form.wilde">
                     <template slot="append">mm</template>
                 </el-input>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="高" prop="consumeWave">
-                <el-input v-model="form.lossRate">
+             <el-form-item label="高" prop="hight">
+                <el-input v-model="form.hight">
                     <template slot="append">mm</template>
                 </el-input>
              </el-form-item>

+ 12 - 12
src/views/material/manage/components/WarehouseInfo.vue

@@ -11,18 +11,18 @@
          <el-row :gutter="24">
            <el-col :span="8">
              <el-form-item label="启用库存预警">
-                <el-radio v-model="form.warning" label="1">是</el-radio>
-                <el-radio v-model="form.warning" label="0">否</el-radio>
+                <el-radio v-model="form.isWarn" :label="1">是</el-radio>
+                <el-radio v-model="form.isWarn" :label="0">否</el-radio>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="允许拆包" prop="isUnpacking">
-                <el-switch v-model="form.isUnpacking"> </el-switch>
+             <el-form-item label="允许拆包" prop="isUnpack">
+                <el-switch v-model="form.isUnpack" :active-value="1" :inactive-value="0"> </el-switch>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="安全库存" prop="safeStock">
-                <el-input  v-model="form.safeStock"/>
+             <el-form-item label="安全库存" prop="secureInventory">
+                <el-input  v-model="form.secureInventory"/>
              </el-form-item>
            </el-col>
            <el-col :span="8">
@@ -37,21 +37,21 @@
            </el-col>
            <el-col :span="8">
              <el-form-item label="盘点模式" prop="inventoryMode">
-               <el-radio v-model="form.inventoryMode" label="1">逐个盘点</el-radio>
-               <el-radio v-model="form.inventoryMode" label="2">批量盘点</el-radio>
+               <el-radio v-model="form.inventoryMode" :label="1">逐个盘点</el-radio>
+               <el-radio v-model="form.inventoryMode" :label="2">批量盘点</el-radio>
              </el-form-item>
            </el-col>
            <el-col :span="8">
-             <el-form-item label="质保预警参考" prop="qualityAssurance">
-                <DictSelection dictName="质保预警参考" clearable v-model="form.qualityAssurance">
+             <el-form-item label="质保预警参考" prop="warrantyWarnRefer">
+                <DictSelection dictName="质保预警参考" clearable v-model="form.warrantyWarnRefer">
                 </DictSelection>
              </el-form-item>
            </el-col>
            <el-col :span="8">
              <el-form-item label="保质期">
                 <div class="form-line">
-                  <el-input  v-model="form.date"/>
-                  <DictSelection class="line-select" dictName="保质期单位" clearable v-model="form.dateUnit">
+                  <el-input  v-model="form.warrantyPeriod"/>
+                  <DictSelection class="line-select" dictName="保质期单位" clearable v-model="form.warrantyPeriodUnit">
                   </DictSelection>
                 </div>
              </el-form-item>

+ 74 - 21
src/views/material/manage/manageMaterial.vue

@@ -134,23 +134,19 @@
     <!-- 分类选择弹窗 -->
     <CategoryDialog ref="categoryRefs" @chooseCategory='confirmCategory'/>
     <!-- 仓储配置 -->
-    <WarehouseInfo ref="warehouseRefs" :form="form"/>
-   <!-- 采购 -->
-    <ProcureInfo ref="procureRefs" :form="form"/>
+    <WarehouseInfo ref="warehouseRefs" :form="categoryWms"/>
     <!-- 生产信息 -->
-     <ProductionInfo ref="productionRefs" :form="form"/>
+     <ProductionInfo ref="productionRefs" :form="categoryMes"/>
      <!-- 计划 -->
-     <PlanInfo ref="planRefs" :form="form"/>
-     <!-- 销售信息 -->
-     <SalesInfo ref="salesRefs" :form="form"/>
+     <PlanInfo ref="planRefs" :form="categoryAps"/>
      <!-- 质量配置 -->
-     <QualityInfo ref="qualityRefs" :form="form"/>
+     <QualityInfo ref="qualityRefs" :form="categoryQms"/>
      <!-- 舟皿信息 -->
-     <BoatInfo ref="qualityRefs" :form="form"/>
+     <BoatInfo ref="qualityRefs" :form="categoryPallet"/>
      <!-- 周转车信息 -->
-     <TurnoverInfo ref="turnoverRefs" :form="form"/>
+     <TurnoverInfo ref="turnoverRefs" :form="categoryVehicle"/>
      <!-- 模具信息 -->
-     <MoldInfo ref="moldRefs" :form="form"/>
+     <MoldInfo ref="moldRefs" :form="categoryMold"/>
      <!-- 备注信息 -->
      <RemarkInfo ref="remarkRefs" :form="remarkform"/>
   </div>
@@ -160,10 +156,10 @@
   import GroupDialog from './components/GroupDialog.vue';
   import CategoryDialog from './components/CategoryDialog.vue';
   import WarehouseInfo from './components/WarehouseInfo.vue';
-  import ProcureInfo from './components/ProcureInfo.vue';
+  // import ProcureInfo from './components/ProcureInfo.vue';
   import ProductionInfo from './components/ProductionInfo.vue';
   import PlanInfo from './components/PlanInfo.vue';
-  import SalesInfo from './components/SalesInfo.vue';
+  // import SalesInfo from './components/SalesInfo.vue';
   import QualityInfo from './components/QualityInfo.vue';
   import BoatInfo from './components/BoatInfo.vue';
   import TurnoverInfo from './components/TurnoverInfo.vue';
@@ -177,8 +173,8 @@
   export default {
     name: 'ManageMaterial',
     components: {
-      GroupDialog , deptSelect , personSelect , WarehouseInfo , ProcureInfo ,ProductionInfo ,
-      PlanInfo , SalesInfo , QualityInfo , BoatInfo , TurnoverInfo , MoldInfo , RemarkInfo , CategoryDialog
+      GroupDialog , deptSelect , personSelect , WarehouseInfo , ProductionInfo ,
+      PlanInfo , QualityInfo , BoatInfo , TurnoverInfo , MoldInfo , RemarkInfo , CategoryDialog
     },
     data() {
       const defaultForm = {
@@ -188,9 +184,16 @@
       return {
          loading:false,
          form:{...defaultForm},
+         categoryAps:{},
+         categoryMes:{},
+         categoryMold:{},
+         categoryPallet:{},
+         categoryQms:{},
+         categoryVehicle:{},
          remarkform:{
            remarkAttach:[]
          },
+         categoryWms:{},
          chooseItem:null,
          PathInfo:{},
          titileStatus:1
@@ -230,8 +233,9 @@
         getDetailInfo(id).then(res=>{
            const info = deepClone(res)
            this.form = {
-             ...info
+             ...info.category
            }
+           this.judgeSet(info)
            delete this.form.remarkAttach
            delete this.form.remark
            // this.$set(this.remarkform,'remarkAttach',info.remarkAttach)
@@ -243,6 +247,46 @@
            }
         })
       },
+
+      // 判断字段类型并赋值
+      judgeSet(info){
+         if(typeof info.categoryAps == 'string'){
+            this.categoryAps = {}
+         }else{
+            this.categoryAps = info.categoryAps
+         }
+         if(typeof info.categoryMes == 'string'){
+            this.categoryMes = {}
+         }else{
+            this.categoryMes = info.categoryMes
+         }
+         if(typeof info.categoryMold == 'string'){
+            this.categoryMold = {}
+         }else{
+            this.categoryMold = info.categoryMold
+         }
+         if(typeof info.categoryPallet == 'string'){
+            this.categoryPallet = {}
+         }else{
+            this.categoryPallet = info.categoryPallet
+         }
+         if(typeof info.categoryQms == 'string'){
+            this.categoryQms = {}
+         }else{
+            this.categoryQms = info.categoryQms
+         }
+         if(typeof info.categoryVehicle == 'string'){
+            this.categoryVehicle = {}
+         }else{
+            this.categoryVehicle = info.categoryVehicle
+         }
+         if(typeof info.categoryWms == 'string'){
+            this.categoryWms = {}
+         }else{
+            this.categoryWms = info.categoryWms
+         }
+      },
+
       // 选择所属部门
       searchDeptNodeClick (id, info) {
         // 根据部门获取人员
@@ -311,12 +355,21 @@
           }
           this.loading = true;
           const data = {
-            ...this.form,
-            ...this.remarkform,
-            ...this.PathInfo
+            categoryWms:this.categoryWms,
+            categoryAps:this.categoryAps,
+            categoryMes:this.categoryMes,
+            categoryMold:this.categoryMold,
+            categoryPallet:this.categoryPallet,
+            categoryQms:this.categoryQms,
+            categoryVehicle:this.categoryVehicle,
+            category:{
+              ...this.form,
+              ...this.remarkform,
+              ...this.PathInfo
+            }
           };
-          const saveOrUpdate = this.form.id ? editMaterial : addMaterial;
-          saveOrUpdate(data)
+          // const saveOrUpdate = this.form.id ? editMaterial : addMaterial;
+          addMaterial(data)
             .then((msg) => {
               this.loading = false;
               this.$message.success(msg);

+ 2 - 2
vue.config.js

@@ -32,10 +32,10 @@ module.exports = {
       // 当我们的本地的请求 有/api的时候,就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
         // target: 'http://192.168.3.51:18086', // 测试
-        // target: 'http://192.168.3.35:8080', // kang杨威
+        target: 'http://192.168.3.35:8080', // kang杨威
         // target: 'http://192.168.3.25:8080', // 黄峥嵘
         // target: 'http://192.168.3.41:8080', // 何江鹏
-        target: 'http://192.168.3.33:8080', // 谢一平
+        // target: 'http://192.168.3.33:8080', // 谢一平
         // target: 'http://192.168.3.64:8080', // 粟勋
         // target: 'http://192.168.3.34:8080', // 刘毅
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域