库存管理查询关联标签mac，导出信息调整

src/views/template/incomeWmsBox.vue

 <template>
   <div class="app-container">
     <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
-            <el-form-item label="lot" prop="lot">
+      <el-form-item label="code" prop="orderCode">
+        <el-input
+          v-model="queryParams.orderCode"
+          placeholder="请输入code"
+          clearable
+          :maxlength="100"
+          size="small"
+          style="width: 150px"
+        />
+      </el-form-item>
+      <el-form-item label="lot" prop="lot">
         <el-input
           v-model="queryParams.lot"
           placeholder="请输入lot"
@@ -37,35 +47,37 @@
           :type="commonField.typePrimary"
           :icon="commonField.queryIcon"
           :size="commonField.smallSize"
-          @click="handleQuery">查询</el-button>
+          @click="handleQuery"
+        >查询</el-button>
         <el-button
           :class="commonField.resetClass"
           :icon="commonField.resetIcon"
           :size="commonField.smallSize"
-          @click="resetQuery">重置</el-button>
+          @click="resetQuery"
+        >重置</el-button>
       </el-form-item>
       <div style="float: right">
         <el-form-item>
-          <el-button
-            :class="commonField.addClass"
-            :type="commonField.typePrimary"
-            :icon="commonField.addIcon"
-            :size="commonField.smallSize"
-            @click="handleAdd">新增</el-button>
           <el-button
             :class="commonField.exportClass"
             :type="commonField.typeSuccess"
             :icon="commonField.exportIcon"
             :size="commonField.smallSize"
-            @click="handleExport">导出</el-button>
+            @click="handleExport"
+          >导出</el-button>
         </el-form-item>
       </div>
     </el-form>
     <div class="placeholder" />
     <div style="padding:5px 10px">
       <div class="mb12 font-small-bold">库存管理列表</div>
-      <el-table v-loading="loading" border :data="incomeWmsBoxList" >
+      <el-table v-loading="loading" border :data="incomeWmsBoxList">
         <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column label="code" prop="orderCode" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            {{ scope.row.orderCode || '-' }}
+          </template>
+        </el-table-column>
         <el-table-column label="lot" prop="lot" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.lot || '-' }}
@@ -76,29 +88,24 @@
             {{ scope.row.pn || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="qty" prop="qty" :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            {{ scope.row.qty || '-' }}
-          </template>
-        </el-table-column>
         <el-table-column label="rank" prop="rank" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.rank || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="code" prop="orderCode" :show-overflow-tooltip="true">
+        <el-table-column label="qty" prop="qty" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.orderCode || '-' }}
+            {{ scope.row.qty || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="label_id" prop="labelId" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.labelId || '-' }}
+            {{ scope.row.mac || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="备注" prop="remarks" :show-overflow-tooltip="true">
+        <el-table-column label="创建人" prop="createBy" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.remarks || '-' }}
+            {{ scope.row.createBy || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="创建时间" prop="createDate" :show-overflow-tooltip="true">
@@ -106,7 +113,7 @@
             <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" class-name="small-padding fixed-width" width="200px">
+        <el-table-column label="操作" class-name="small-padding fixed-width" width="100px">
           <template slot-scope="scope">
             <el-button
               :class="commonField.updateClass"
@@ -114,46 +121,49 @@
               :size="commonField.size"
               @click="handleUpdate(scope.row)"
             >修改</el-button>
+            <el-button
+              :class="commonField.delClass"
+              :type="commonField.typeParent"
+              :size="commonField.size"
+              @click="handleDelete(scope.row)"
+            >删除</el-button>
           </template>
         </el-table-column>
       </el-table>
     </div>
     <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.rows"
-        @pagination="getList"
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.rows"
+      @pagination="getList"
     />
     <!-- 添加或修改库存管理配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="90px">
+        <el-form-item label="code" prop="orderCode">
+          <el-input v-model.trim="form.orderCode" show-word-limit :maxlength="100" placeholder="请输入code" />
+        </el-form-item>
         <el-form-item label="lot" prop="lot">
           <el-input v-model.trim="form.lot" show-word-limit :maxlength="100" placeholder="请输入lot" />
         </el-form-item>
         <el-form-item label="pn" prop="pn">
           <el-input v-model.trim="form.pn" show-word-limit :maxlength="100" placeholder="请输入pn" />
         </el-form-item>
-        <el-form-item label="qty" prop="qty">
-          <el-input-number v-model.trim="form.qty" controls-position="right" :min="0" />
-        </el-form-item>
         <el-form-item label="rank" prop="rank">
           <el-input v-model.trim="form.rank" show-word-limit :maxlength="100" placeholder="请输入rank" />
         </el-form-item>
-        <el-form-item label="code" prop="orderCode">
-          <el-input v-model.trim="form.orderCode" show-word-limit :maxlength="100" placeholder="请输入code" />
+        <el-form-item label="qty" prop="qty">
+          <el-input-number v-model.trim="form.qty" controls-position="right" :min="0" />
         </el-form-item>
         <el-form-item label="label_id" prop="labelId">
           <el-input v-model.trim="form.labelId" show-word-limit :maxlength="50" placeholder="请输入label_id" />
         </el-form-item>
-          <el-form-item label="状态">
-            <el-radio-group v-model="form.flag">
-              <el-radio label="1">启用</el-radio>
-              <el-radio label="0">停用</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        <el-form-item label="备注" prop="remarks">
-          <el-input v-model.trim="form.remarks" maxlength="200" show-word-limit type="textarea" placeholder="请输入内容" />
+        <el-form-item label="状态">
+          <el-radio-group v-model="form.flag">
+            <el-radio label="1">启用</el-radio>
+            <el-radio label="0">停用</el-radio>
+          </el-radio-group>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -230,11 +240,11 @@ export default {
     getList() {
       this.loading = true
       listIncomeWmsBox(this.queryParams).then(
-              response => {
-                this.incomeWmsBoxList = response.rows
-                this.total = response.total
-                this.loading = false
-              }
+        response => {
+          this.incomeWmsBoxList = response.rows
+          this.total = response.total
+          this.loading = false
+        }
       )
     },
     // 取消按钮

src/views/template/incomeWmsLabel.vue

@@ -70,6 +70,11 @@
       <div class="mb12 font-small-bold">标签管理列表</div>
       <el-table v-loading="loading" border :data="incomeWmsLabelList">
         <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column label="id" prop="businessId" :show-overflow-tooltip="true" width="75">
+          <template slot-scope="scope">
+            {{ scope.row.businessId || '-' }}
+          </template>
+        </el-table-column>
         <el-table-column label="mac" prop="mac" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.mac || '-' }}