Merge branch 'feature/jzc/brand/0.0.2' into dev

src/views/mes/dv/brandquotation/brandquotationApply.vue

@@ -8,6 +8,22 @@
       v-show="showSearch"
       label-width="100px"
     >
+      <el-form-item label="品牌报价名称" prop="brandQuotationName">
+        <el-input
+          v-model="queryParams.brandQuotationName"
+          placeholder="请输入品牌报价名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+            <el-form-item label="品牌名称" prop="brandName">
+        <el-input
+          v-model="queryParams.brandName"
+          placeholder="请输入品牌名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="产品名称" prop="itemName">
         <el-input
           v-model="queryParams.itemName"
@@ -16,7 +32,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="单据状态" prop="prototypeRequestStatus">
+      <!-- <el-form-item label="单据状态" prop="prototypeRequestStatus">
         <el-select
           v-model="queryParams.prototypeRequestStatus"
           clearable
@@ -30,7 +46,7 @@
           >
           </el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="样品名称" prop="abbreviation">
         <el-input
           v-model="queryParams.itemName"
@@ -137,6 +153,13 @@
         align="center"
         prop="brandQuotationName"
         :show-overflow-tooltip="true"
+      />
+            <el-table-column
+        label="品牌名称"
+        width="120"
+        align="center"
+        prop="brandName"
+        :show-overflow-tooltip="true"
       />
       <el-table-column
         label="产品名称"
@@ -264,7 +287,8 @@ export default {
         pageNum: 1,
         pageSize: 10,
         itemName: null, // 可以查简称与英文名
-        prototypeRequestStatus: null,
+        brandQuotationName: null,
+        brandName: null,
       },
       options: [
         // { value: null, label: "全部订单" },
@@ -294,7 +318,7 @@ export default {
     getList() {
       this.loading = true;
       listBrandQuotation(this.queryParams).then((response) => {
-        this.prototypeRequestList = response.rows;
+        this.brandQuotationList = response.rows;
         this.total = response.total;
         this.loading = false;
       });