Merge remote-tracking branch 'origin/master'

src/views/modules/warehouse/labelQuery.vue

@@ -24,6 +24,18 @@
       <el-form-item label="物料描述">
         <el-input style="width: 120px;" v-model="queryHeaderData.partDesc" placeholder="请输入物料描述" @keyup.enter.native="getDataList()"></el-input>
       </el-form-item>
+      <el-form-item label="标签来源">
+        <el-select v-model="queryHeaderData.sourceType" placeholder="请选择" style="width: 120px;">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="初始化" value="IFS_INIT"></el-option>
+          <el-option label="采购入库" value="PO_RECEIVE"></el-option>
+          <el-option label="成品入库" value="SHOP_ORDER_RECEIVEY"></el-option>
+          <el-option label="销售退货" value="SALES_RETURN_RECEIVE"></el-option>
+          <el-option label="生产退料" value="PRORE_CREATE"></el-option>
+          <el-option label="委外退料" value="OUTRE_CREATE"></el-option>
+          <el-option label="标签拆分" value="SPLIT"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item style="margin-top: 20px;">
         <el-button @click="getDataList()" type="primary">查询</el-button>
         <el-button @click="resetQuery()" type="default">重置</el-button>
@@ -423,6 +435,26 @@ export default {
           showOverflowTooltip: true,
           fixed: ""
         },
+        {
+          columnProp: "sourceType",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "来源",
+          columnWidth: 100,
+          columnSortable: false,
+          showOverflowTooltip: true,
+          fixed: ""
+        },
+        {
+          columnProp: "remark",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "备注",
+          columnWidth: 100,
+          columnSortable: false,
+          showOverflowTooltip: true,
+          fixed: ""
+        },
         {
           columnProp: "reserveFlag",
           headerAlign: "center",