问题清单739

src/views/mes/pro/workorder/indexApply.vue

@@ -57,6 +57,10 @@
       <el-form-item label="客户名称" prop="clientName">
         <el-input v-model="queryParams.clientName" placeholder="请输入客户名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
+      <el-form-item label="品牌名称" prop="brandName">
+        <el-input v-model="queryParams.brandName" placeholder="请输入品牌名称" clearable type="textarea" :rows="2"
+        resize="none"  @keyup.enter.native="handleQuery" />
+      </el-form-item>
       <el-form-item label="产品分类" prop="itemTypeName">
         <el-input v-model="queryParams.itemTypeName" placeholder="请输入产品分类" clearable
           @keyup.enter.native="handleQuery" />
@@ -293,6 +297,9 @@
       <el-table-column label="产品编号" width="120" align="center" prop="sapItemCode" />
       <el-table-column label="产品名称" width="200" align="center" prop="productName" />
       <el-table-column label="规格型号" align="center" prop="productSpc" :show-overflow-tooltip="true" />
+      <el-table-column label="品牌名称" align="center" prop="brandName" :show-overflow-tooltip="true" />
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column label="过期天数" align="center" prop="expiredDay" :show-overflow-tooltip="true" />
       <el-table-column label="需求日期" align="center" prop="requestDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.requestDate, "{y}-{m}-{d}") }}</span>
@@ -817,6 +824,7 @@ export default {
         clientCode: null,
         clientName: null,
         requestDate: null,
+        brandName: null,
         parentId: null,
         ancestors: null,
         statusArr: ["PREPARE", "PUBLISHED"],