修改bug

src/api/produce/picking.js

@@ -69,3 +69,12 @@ export async function listOutsourceInWarehouse(params) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+//获取物品维度的库存数据
+export async function getOutindetailtwo(params) {
+  const res = await request.get(`wms/outInDetailPda/page`, { params });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/views/produce/components/feeding/components/batchProductsBom.vue

@@ -253,6 +253,10 @@
 
       async getQualityParam() {
         if (this.form.quantity && this.form.batchNo) {
+          if (Number(this.itemData.feedQuantity) == 0) {
+            this.$message.warning('拆批数不能等于0');
+            return;
+          }
           if (this.itemData.feedQuantity <= this.form.quantity) {
             this.$message.warning('拆批数不能大于数量');
             return;

src/views/produce/components/feeding/components/modelBom.vue

@@ -7,25 +7,23 @@
     </div>
 
     <div class="material">
-      <div class="content_table" v-for="(item, index) in list" :key="index">
+      <div class="content_table" v-for="(it, index) in list" :key="index">
         <div class="item rx-sc">
           <div class="rx ww33">
             <div class="lable rx-cc">模具名称</div>
             <div class="content">
-              {{
-                item.name 
-              }}
+              {{ it.name }}
             </div>
           </div>
 
           <div class="rx ww33">
             <div class="lable rx-cc">模具编码</div>
-            <div class="content">{{ item.code }}</div>
+            <div class="content">{{ it.code }}</div>
           </div>
 
           <div class="rx ww33">
             <div class="lable rx-cc">模具编号</div>
-            <div class="content">{{ item.codeNumber }}</div>
+            <div class="content">{{ it.codeNumber }}</div>
           </div>
         </div>
 
@@ -33,35 +31,38 @@
           <div class="rx ww33">
             <div class="lable rx-cc">已冲压次数</div>
             <div class="content rx-sc">
-              <div>{{ item.startCyTimes}}</div>
+              <div>{{ it.startCyTimes }}</div>
             </div>
           </div>
 
-
-
           <div class="rx ww33">
             <div class="lable rx-cc">最大冲压数</div>
             <div class="content rx-sc">
-              <div>{{ item.extInfo.maxCyTimes }}</div>
+              <div>{{ it.extInfo.maxCyTimes }}</div>
             </div>
           </div>
 
           <div class="rx ww33">
             <div class="lable rx-cc">本次冲压数</div>
             <div class="content content_num rx-sc">
-              <el-input size="mini" v-model="item.extInfo.cyTimes" placeholder="请输入本次冲压数" />
+              <el-input
+                size="mini"
+                v-model="it.extInfo.cyTimes"
+                placeholder="请输入本次冲压数"
+              />
             </div>
           </div>
         </div>
 
         <div class="del_box">
-          <el-link type="danger" icon="el-icon-delete" @click="getDelete(index)"></el-link>
+          <el-link
+            type="danger"
+            icon="el-icon-delete"
+            @click="getDelete(index)"
+          ></el-link>
         </div>
       </div>
     </div>
-
-
-
   </div>
 </template>
 <script>
@@ -70,11 +71,40 @@
       list: {
         type: Array,
         default: () => []
+      },
+      item: {
+        type: Object,
+        default: {}
+      }
+    },
+
+    watch: {
+      item: {
+        handler(newVal) {
+          console.log(newVal, 'newVal');
+          if (newVal) {
+            let formedNum = 0;
+            let notFormedNum = 0;
+            if (newVal.workReportInfo.formedNum) {
+              formedNum = Number(newVal.workReportInfo.formedNum);
+            }
+            if (newVal.workReportInfo.notFormedNum) {
+              notFormedNum = Number(newVal.workReportInfo.notFormedNum);
+            }
+            const totalNum = formedNum + notFormedNum;
+
+            this.list.forEach((it, index) => {
+              this.$set(this.list[index].extInfo, 'cyTimes', totalNum);
+            });
+          }
+        },
+        immediate: true,
+        deep: true
       }
     },
     methods: {
       getDelete(index) {
-        this.list.splice(index, 1)
+        this.list.splice(index, 1);
       }
     }
   };

src/views/produce/components/feeding/components/workOrderBom.vue

@@ -66,6 +66,9 @@
                 >完成委外-未质检</div
               >
             </div>
+            <div v-else>
+              <div class="content">未委外</div>
+            </div>
             <div v-else>
               <div class="content">{{ '' }}</div>
             </div>

src/views/produce/components/jobBooking/components/batchSemiProductJobBom.vue

@@ -260,6 +260,7 @@
             size="mini"
             class="content_num"
             v-model="row.extInfo.taskId"
+            clearable
             filterable
             placeholder="请选择"
             @change="(e) => selectName(e, $index)"
@@ -1127,6 +1128,11 @@
 
       async getQualityParam() {
         if (this.batchForm.quantity && this.batchForm.batchNo) {
+          if (Number(this.itemData.feedQuantity) == 0) {
+            this.$message.warning('拆批数不能等于0');
+            return;
+          }
+
           if (this.itemData.feedQuantity <= this.batchForm.quantity) {
             this.$message.warning('拆批数不能大于数量');
             return;

src/views/produce/components/jobBooking/index.vue

@@ -126,6 +126,7 @@
           :list="item.modelList"
           pattern="job"
           ref="modelRef"
+          :item="item"
         ></modelBom>
 
         <palletBom
@@ -318,7 +319,23 @@
         <!--  <packingBom :taskId='taskObj.id' :workOrderId="item.workOrderId" :objData="item" ref="packRef"
           v-if='taskObj.type == 4 && clientEnvironmentId != 3 && item'></packingBom> -->
 
-        <packingTgBom
+        <!-- <semiProductJobBom
+          :singleReport="item.singleReport"
+          v-if="
+            item.semiProductList &&
+            item.semiProductList.length != 0 &&
+            item.singleReport == 1
+          "
+          :item="item"
+          :list="item.semiProductList"
+          :equipmentList="item.equipmentList"
+          :isChoose="isChoose"
+          @chooseData="chooseData"
+          :isEngrave="isEngrave"
+          :isDisposal="isDisposal"
+        ></semiProductJobBom> -->
+
+        <!-- <packingTgBom
           v-if="
             item.pickOutInList &&
             item.pickOutInList.length != 0 &&
@@ -327,7 +344,22 @@
           "
           :list="item.pickOutInList"
           :item="item"
-        ></packingTgBom>
+        ></packingTgBom> -->
+        <semiProductJobBom
+          v-if="
+            item.pickOutInList &&
+            item.pickOutInList.length != 0 &&
+            taskObj.type == 4 &&
+            clientEnvironmentId == 3
+          "
+          :singleReport="item.singleReport"
+          :list="item.semiProductList"
+          :equipmentList="item.equipmentList"
+          :item="item"
+          @chooseData="chooseData"
+          :isEngrave="isEngrave"
+          :isDisposal="isDisposal"
+        ></semiProductJobBom>
       </div>
     </div>
 
@@ -571,7 +603,6 @@
                 } else if (
                   this.taskObj.type == 4 &&
                   obj.singleReport == 1 &&
-                  this.clientEnvironmentId != 3 &&
                   this.clientEnvironmentId != 2
                 ) {
                   if (obj.pickOutInList && obj.pickOutInList.length != 0) {

src/views/produce/components/picking/index.vue

@@ -2,6 +2,7 @@
   <ele-modal
     title="新建领料单"
     :visible.sync="visible"
+    v-if="visible"
     :before-close="handleClose"
     :close-on-click-modal="false"
     :maxable="true"
@@ -421,6 +422,8 @@
       },
 
       allSelection(id, list) {
+        console.log(id, list, '============>');
+        console.log(this.workList, 'workList============>');
         this.workList.forEach((e) => {
           if (e.id == id) {
             e.pickList = list;

src/views/produce/components/picking/pickingList.vue

@@ -12,6 +12,8 @@
     <el-card shadow="never">
       <pickingListSearch @search="reload" ref="searchRef" />
 
+      <!-- <pickingSearch v-else @search="reload" ref="pickingRef" /> -->
+
       <ele-split-layout
         width="244px"
         allow-collapse
@@ -144,14 +146,17 @@
 <script>
   import AssetTree from '../../components/assetTree.vue';
   import pickingListSearch from './pickingListSearch.vue';
+  import pickingSearch from './pickingSearch.vue';
   import {
     pageeLedgerMain,
     assetPage,
     listInProduct
   } from '@/api/produce/workOrder';
 
+  import { getOutindetailtwo } from '@/api/produce/picking';
+
   export default {
-    components: { AssetTree, pickingListSearch },
+    components: { AssetTree, pickingListSearch, pickingSearch },
     props: {
       isType: {
         type: String,
@@ -183,18 +188,8 @@
         selection: [],
 
         allSelection: [],
-        temporaryList: []
-      };
-    },
-
-    computed: {
-      tableKey() {
-        return `table-${this.rootCategoryLevelId}`;
-      },
-
-      // 表格列配置
-      columns() {
-        return [
+        temporaryList: [],
+        cloumsAll: [
           {
             width: 45,
             type: 'selection',
@@ -391,7 +386,217 @@
                 }
               ]
             : [])
-        ];
+        ]
+      };
+    },
+
+    computed: {
+      tableKey() {
+        return `table-${this.rootCategoryLevelId}`;
+      },
+
+      // 表格列配置
+      columns() {
+        return this.cloumsAll;
+
+        // return [
+        //   {
+        //     width: 45,
+        //     type: 'selection',
+        //     columnKey: 'selection',
+        //     align: 'center',
+        //     reserveSelection: true
+        //   },
+        //   {
+        //     columnKey: 'index',
+        //     label: '序号',
+        //     type: 'index',
+        //     width: 50,
+        //     align: 'center'
+        //   },
+        //   {
+        //     prop: 'code',
+        //     label: '物品编码',
+        //     slot: 'code'
+        //   },
+        //   {
+        //     prop: 'codeNumber',
+        //     label: '编号',
+        //     showOverflowTooltip: true
+        //   },
+        //   {
+        //     prop: 'name',
+        //     label: '名称',
+        //     showOverflowTooltip: true
+        //   },
+        //   {
+        //     prop: 'brandNum',
+        //     label: '牌号',
+        //     showOverflowTooltip: true
+        //   },
+        //   {
+        //     prop: 'specification',
+        //     label: '规格',
+        //     showOverflowTooltip: true
+        //   },
+        //   {
+        //     prop: 'modelType',
+        //     label: '型号',
+        //     showOverflowTooltip: true
+        //   },
+
+        //   {
+        //     prop: 'batchNo',
+        //     label: '批次号',
+        //     align: 'center'
+        //   },
+        //   // {
+        //   //   prop: 'manualBatchNo',
+        //   //   label: '批次号',
+        //   //   align: 'center'
+        //   // },
+        //   {
+        //     prop: 'availableCountBase',
+        //     label: '计量库存数量',
+        //     sortable: 'custom',
+        //     slot: 'availableCountBase',
+        //     showOverflowTooltip: true,
+        //     width: 130,
+        //     align: 'center'
+        //   },
+
+        //   ...([1, 23, 8].includes(Number(this.rootCategoryLevelId))
+        //     ? [
+        //         {
+        //           prop: 'packingCountBase',
+        //           label: '包装库存',
+        //           slot: 'packingCountBase',
+        //           showOverflowTooltip: true
+        //         }
+        //       ]
+        //     : []),
+
+        //   {
+        //     prop: 'weight',
+        //     label: '重量',
+        //     showOverflowTooltip: true,
+        //     slot: 'weight'
+        //   },
+
+        //   {
+        //     prop: 'expirationDate',
+        //     slot: 'expirationDate',
+        //     label: '库存保质期',
+        //     width: 100
+        //   },
+        //   {
+        //     prop: 'expirationTime',
+        //     label: '周期倒计时',
+        //     showOverflowTooltip: true,
+        //     width: 100
+        //   },
+        //   {
+        //     prop: 'qualityResult',
+        //     slot: 'qualityResult',
+        //     label: '质检结果',
+        //     showOverflowTooltip: true,
+        //     width: 100
+        //   },
+        //   {
+        //     prop: 'qualityStatus',
+        //     slot: 'qualityStatus',
+        //     label: '质检状态',
+        //     showOverflowTooltip: true,
+        //     width: 100
+        //   },
+        //   {
+        //     prop: 'pathName',
+        //     width: 230,
+        //     label: '仓库',
+        //     showOverflowTooltip: true
+        //   },
+
+        //   ...(this.rootCategoryLevelId == '4'
+        //     ? [
+        //         {
+        //           prop: 'workstationName',
+        //           label: '工位',
+        //           showOverflowTooltip: true
+        //         },
+
+        //         {
+        //           prop: 'runStatus',
+        //           label: '状态',
+        //           slot: 'runStatus',
+        //           showOverflowTooltip: true
+        //         }
+        //       ]
+        //     : []),
+
+        //   // ...(this.rootCategoryLevelId == '5'
+        //   //   ? [
+        //   //       {
+        //   //         prop: 'dieHoleNum',
+        //   //         label: '模孔数量',
+        //   //         showOverflowTooltip: true
+        //   //       },
+        //   //       {
+        //   //         prop: 'mandrelDiameter',
+        //   //         label: '芯棒直径',
+        //   //         showOverflowTooltip: true
+        //   //       },
+        //   //       {
+        //   //         prop: 'shrinkEffictive',
+        //   //         label: '收缩系数',
+        //   //         showOverflowTooltip: true
+        //   //       }
+        //   //     ]
+        //   //   : []),
+
+        //   // ...(this.rootCategoryLevelId == '7'
+        //   //   ? [
+        //   //       {
+        //   //         prop: 'materialQuality',
+        //   //         label: '材质',
+        //   //         showOverflowTooltip: true
+        //   //       },
+
+        //   //       {
+        //   //         prop: 'vehicleLen',
+        //   //         label: '长宽高',
+        //   //         slot: 'vehicleLen',
+        //   //         showOverflowTooltip: true
+        //   //       }
+        //   //     ]
+        //   //   : []),
+
+        //   ...(this.rootCategoryLevelId == '8'
+        //     ? [
+        //         {
+        //           prop: 'extInfo.slotNum',
+        //           label: '槽数',
+        //           showOverflowTooltip: true
+        //         }
+        //       ]
+        //     : []),
+
+        //   ...(this.rootCategoryLevelId == '11'
+        //     ? [
+        //         {
+        //           prop: 'status',
+        //           label: '状态',
+        //           slot: 'status',
+        //           showOverflowTooltip: true
+        //         },
+
+        //         {
+        //           prop: 'region',
+        //           label: '位置',
+        //           showOverflowTooltip: true
+        //         }
+        //       ]
+        //     : [])
+        // ];
       }
     },
     watch: {},
@@ -409,7 +614,8 @@
         if (this.isType == 'pick') {
           param.dimension = 1;
 
-          URL = pageeLedgerMain;
+          // URL = pageeLedgerMain;
+          URL = getOutindetailtwo;
         } else if (this.isType == 'feed') {
           if ([4, 7, 14].includes(Number(this.rootCategoryLevelId))) {
             URL = assetPage;
@@ -465,6 +671,11 @@
           );
 
           res.list = _list;
+          // if (this.isType == 'pick') {
+          //   this.columns = this.cloumsPick;
+          // } else {
+          //   this.columns = this.cloumsAll
+          // }
           return res;
         }
       },
@@ -607,7 +818,6 @@
           this.allSelection.sort(
             (a, b) => a.rootCategoryLevelId - b.rootCategoryLevelId
           );
-
           this.$emit('allSelection', this.id, this.allSelection);
           this.handleClose();
         }
@@ -617,7 +827,8 @@
     created() {
       if (this.isType == 'pick') {
         // this.treeIds = '1, 5, 7, 8, 10, 13, 14, 23, 26, 9, 28';
-        this.treeIds = '9, 23, 2, 1, 4, 14, 5, 8, 16, 13, 15, 6, 10, 22';
+        // this.treeIds = '9, 23, 2, 1, 4, 14, 5, 8, 16, 13, 15, 6, 10, 22';
+        this.treeIds = '9, 1, 14, 5, 8, 13, 15, 6, 10, 22';
       } else if (this.isType == 'feed') {
         this.treeIds = '1, 2, 4, 5, 7, 8, 10, 11, 13, 14, 26, 9, 23,28';
       } else if (this.isType == 'job') {

src/views/produce/components/picking/pickingSearch.vue

@@ -0,0 +1,110 @@
+<!-- 搜索表单 -->
+<template>
+  <el-form
+    label-width="77px"
+    class="ele-form-search"
+    @keyup.enter.native="search"
+    @submit.native.prevent
+  >
+    <el-row :gutter="15">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="关键词:" prop="keyWord">
+          <el-input
+            clearable
+            v-model="where.keyWord"
+            placeholder="请输入"
+          ></el-input>
+
+          <el-popover
+            placement="top-start"
+            width="200"
+            trigger="hover"
+            content="支持物品编码，物品名称，型号，规格查询"
+          >
+            <i
+              class="el-icon-question"
+              slot="reference"
+              style="color: #40a9ff; font-size: 14px; margin-left: 10px"
+            ></i>
+          </el-popover>
+        </el-form-item>
+      </el-col>
+
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <div class="ele-form-actions">
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            class="ele-btn-icon"
+            @click="search"
+            size="small"
+          >
+            查询
+          </el-button>
+          <el-button
+            @click="reset"
+            icon="el-icon-refresh-left"
+            size="small"
+            type="primary"
+            >重置</el-button
+          >
+        </div>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+
+<script>
+  import { getWarehouseList } from '@/api/produce/index.js';
+  export default {
+    data() {
+      // 默认表单数据
+      const defaultWhere = {
+        keyWord: ''
+      };
+      return {
+        defaultWhere,
+        // 表单数据
+        where: { ...defaultWhere },
+        warehouseList: []
+      };
+    },
+    computed: {
+      // 是否开启响应式布局
+      styleResponsive() {
+        return this.$store.state.theme.styleResponsive;
+      }
+    },
+    created() {
+      this.getArguInfo();
+    },
+    methods: {
+      /* 搜索 */
+      search() {
+        this.$emit('search', this.where);
+      },
+      /*  重置 */
+      reset() {
+        this.where = { ...this.defaultWhere };
+        this.search();
+      },
+      //搜索数据源
+      async getArguInfo() {
+        const { data } = await getWarehouseList();
+        this.warehouseList = data;
+      }
+    }
+  };
+</script>
+
+<style scoped>
+  .ele-form-actions {
+    display: inline-block;
+    transform: translate(0);
+    transition: all;
+  }
+
+  ::v-deep .el-form-item__content {
+    display: flex;
+  }
+</style>

src/views/produce/components/warehousing/index.vue

@@ -114,6 +114,72 @@
             ></packingTgBom>
           </div>
         </div>
+
+        <div
+          v-else-if="
+            clientEnvironmentId == 3 &&
+            !item.toWarehouseList &&
+            item.singleReport == 1
+          "
+        >
+          <div class="item">
+            <div>
+              <div class="text">仓库</div>
+              <div class="select-type">
+                <el-select
+                  v-model="warehouseId"
+                  filterable
+                  clearable
+                  placeholder="请选择仓库"
+                  size="mini"
+                  class="content_num"
+                >
+                  <el-option
+                    v-for="item in warehouseList"
+                    :key="item.id"
+                    :value="item.id"
+                    :label="item.name"
+                  ></el-option>
+                </el-select>
+              </div>
+            </div>
+
+            <div>
+              <div class="text">入库规格</div>
+              <div class="select-type">
+                <el-select
+                  v-model="inWarehouseSpecType"
+                  filterable
+                  clearable
+                  placeholder="请选择入库规格"
+                  size="mini"
+                  class="content_num select-warehousing"
+                  disabled
+                >
+                  <el-option
+                    v-for="item in WarehouseSpecTypeList"
+                    :key="item.value"
+                    :label="item.text"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+            </div>
+          </div>
+
+          <batchSemiProductJobBom
+            :list="item.semiProductList"
+            :item="item"
+            :singleReport="item.singleReport"
+            :storeType="storeType"
+            :equipmentList="item.equipmentList"
+            :isChoose="isChoose"
+            :isEngrave="isEngrave"
+            :isDisposal="isDisposal"
+          >
+          </batchSemiProductJobBom>
+        </div>
+
         <!-- 单独报工 -->
         <div
           v-else-if="
@@ -505,7 +571,7 @@
                 formingWeight: null,
                 formedNum: null,
                 formedWeight: null,
-                taskId: this.taskObj.id,
+                taskId: '',
                 executorTime: null
               };
 
@@ -523,6 +589,21 @@
                 ...obj
               };
             });
+            this.List.forEach((item) => {
+              if (item.semiProductList && item.semiProductList.length != 0) {
+                item.semiProductList.forEach((it) => {
+                  it.extInfo.taskId = '';
+                  it.extInfo.taskName = '';
+                });
+              } else if (item.product && item.product.length != 0) {
+                item.product.forEach((it) => {
+                  it.extInfo.taskId = '';
+                  it.extInfo.taskName = '';
+                });
+              }
+            });
+
+            console.log(this.List, 'listList');
           })
           .finally(() => {
             this.isLoad = true;
@@ -641,6 +722,14 @@
       },
 
       save() {
+        for (let i = 0; i < this.List.length; i++) {
+          if (!this.List[i].workReportInfo.executorTime) {
+            this.$message.warning('报工时间不能为空');
+
+            return;
+          }
+        }
+
         if (this.clientEnvironmentId == 21) {
           if (!this.warehouseId) {
             return this.$message.warning('请选择仓库');
@@ -722,6 +811,8 @@
           _arr = this.List.filter((item) => {
             if (item.toWarehouseList && item.toWarehouseList.length > 0) {
               return item.toWarehouseList.length > 0;
+            } else {
+              return true;
             }
           });
 

src/views/produce/components/workPlan/edit.vue

@@ -1250,7 +1250,8 @@
             .then((msg) => {
               this.loading = false;
               this.$message.success(msg);
-              this.cancel();
+              // this.cancel();
+              this.visible = false;
               this.$emit('done');
             })
             .catch((e) => {

src/views/produce/components/workPlan/index.vue

@@ -1,6 +1,7 @@
 <template>
   <ele-modal
     :visible.sync="visible"
+    v-if="visible"
     :before-close="handleClose"
     :close-on-click-modal="true"
     :close-on-press-escape="false"
@@ -15,7 +16,6 @@
         <!-- <seek-page :seekList="seekList" @search="search"></seek-page> -->
 
         <ele-pro-table
-          v-if="visible"
           ref="table"
           :columns="columns"
           :datasource="datasource"
@@ -134,7 +134,7 @@
         @closeModel="closeModel"
       />
 
-      <edit ref="editRef" @close="close" />
+      <edit ref="editRef" @close="close" @done="done" />
     </div>
   </ele-modal>
 </template>
@@ -466,7 +466,6 @@
       },
 
       search(where) {
-        console.log(1111);
         this.$refs.table.reload({
           limit: 20,
           page: 1
@@ -510,10 +509,11 @@
           .catch((e) => {});
       },
       done() {
-        this.datasource({
-          page: 1,
-          limit: 20
-        });
+        // this.datasource({
+        //   page: 1,
+        //   limit: 20
+        // });
+        this.search();
       },
       openNumber(row) {
         this.formData.certificateNumber = row.certificateNumber;

src/views/produceOrder/index.vue

@@ -338,6 +338,7 @@
             placeholder: '',
             width: 240
           },
+          
           {
             label: '产品名称：',
             value: 'productName',

src/views/unacceptedProduct/components/order-search.vue

@@ -97,9 +97,9 @@
         // 表单数据
         where: { ...defaultWhere },
         statusList: [
-          { name: '待处理', code: 0 },
-          { name: '处理中', code: 1 },
-          { name: '已处理', code: 2 }
+          { name: '待处置', code: 0 },
+          { name: '部分处置', code: 1 },
+          { name: '处置完成', code: 2 }
         ]
       };
     },

src/views/unacceptedProduct/index.vue

@@ -296,11 +296,9 @@
       },
 
       getDispose(item) {
-        for (let i = 0; i < this.disposeList.length; i++) {
-          if (this.disposeList[i].value == item.status) {
-            return this.disposeList[i].label;
-          }
-        }
+        const data = this.disposeList.find((it) => it.value == item.status);
+
+        return data ? data.label : '';
       },
 
       getQuality(item) {

vue.config.js

@@ -35,14 +35,14 @@ module.exports = {
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.103:18086',192.168.1.116
-        // target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.144:18086',
         // target: 'http://192.168.1.30:18086',
         // target: 'http://192.168.1.211:18086',
         // target: 'http://192.168.1.33:18086',
         // target: 'http://192.168.1.251:18186',
-        target: 'http://192.168.1.251:18087',
+        // target: 'http://192.168.1.251:18087',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''