Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/api/mes/md/sizeGroup.js

+import request from '@/utils/request'
+
+// 查询尺码组列表
+export function listGroup(query) {
+  return request({
+    url: '/md/group/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询尺码组详细
+export function getGroup(sizeGroupId) {
+  return request({
+    url: '/md/group/' + sizeGroupId,
+    method: 'get'
+  })
+}
+
+// 新增尺码组
+export function addGroup(data) {
+  return request({
+    url: '/md/group',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改尺码组
+export function updateGroup(data) {
+  return request({
+    url: '/md/group',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除尺码组
+export function delGroup(sizeGroupId) {
+  return request({
+    url: '/md/group/' + sizeGroupId,
+    method: 'delete'
+  })
+}

src/api/mes/md/sizeGroupItem.js

+import request from '@/utils/request'
+
+// 查询尺码组明细列表
+export function listItem(query) {
+  return request({
+    url: '/md/item/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询尺码组明细详细
+export function getItem(sizeGroupItemId) {
+  return request({
+    url: '/md/item/' + sizeGroupItemId,
+    method: 'get'
+  })
+}
+
+// 新增尺码组明细
+export function addItem(data) {
+  return request({
+    url: '/md/item',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改尺码组明细
+export function updateItem(data) {
+  return request({
+    url: '/md/item',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除尺码组明细
+export function delItem(sizeGroupItemId) {
+  return request({
+    url: '/md/item/' + sizeGroupItemId,
+    method: 'delete'
+  })
+}

src/components/clientSelect/single.vue

@@ -5,6 +5,7 @@
     :modal= false
     width="80%"
     center
+    append-to-body
     >
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-row>

src/views/mes/md/brandcontact/index.vue → src/views/mes/md/brand/brandContactIndex.vue

@@ -266,12 +266,11 @@
                   @click="handleBrandSelect"
                 ></el-button>
               </el-input>
-
+            </el-form-item>
             <BrandSelect
               ref="brSelect"
               @onSelected="onBrandSelected"
             ></BrandSelect>
-                        </el-form-item>
           </el-col>
 
           <el-col :span="8">
@@ -475,6 +474,7 @@ export default {
       this.form = {
         brandContactId: null,
         brandId: null,
+        brandName: null,
         contactName: null,
         contactNameEn: null,
         contactPhone: null,

src/views/mes/md/product/components/customerLoss.vue

@@ -10,7 +10,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['md:loss:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -21,7 +22,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['md:loss:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -32,22 +34,38 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['md:loss:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="lossList" @selection-change="handleSelectionChange">
+    <ClientSelect ref="ClientSelectRef" @onSelected="onClientSelect" />
+
+    <el-table
+      v-loading="loading"
+      :data="lossList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-<!--      <el-table-column label="产品lossID" align="center" prop="productLossId" />
-      <el-table-column label="产品ID" align="center" prop="itemId" />-->
       <el-table-column label="客户名称" align="center" prop="customerName" />
       <el-table-column label="分段数量" align="center" prop="segmentCount" />
-      <el-table-column label="最大loss数量" align="center" prop="maxLossCount" />
-      <el-table-column label="loss比率(单位%)" align="center" prop="lossRate" />
+      <el-table-column
+        label="最大loss数量"
+        align="center"
+        prop="maxLossCount"
+      />
+      <el-table-column label="loss比率(单位%)" width="140" align="center" prop="lossRate" />
       <el-table-column label="冗余量" align="center" prop="lossRedundance" />
       <el-table-column label="备注信息" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -55,20 +73,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['md:loss:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['md:loss:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -78,20 +98,33 @@
     <!-- 添加或修改产品loss配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-<!--        <el-form-item label="产品ID" prop="itemId">
-          <el-input v-model="form.itemId" placeholder="请输入产品ID" />
-        </el-form-item>-->
         <el-form-item label="客户名称" prop="customerName">
-          <el-input v-model="form.customerName" placeholder="请输入客户名称" />
+          <el-input
+            v-model="form.customerName"
+            placeholder="请选择客户"
+            disabled
+          >
+            <el-button
+              slot="append"
+              icon="el-icon-search"
+              @click="openClientSelect"
+            ></el-button>
+          </el-input>
         </el-form-item>
         <el-form-item label="分段数量" prop="segmentCount">
           <el-input v-model="form.segmentCount" placeholder="请输入分段数量" />
         </el-form-item>
         <el-form-item label="最大loss数量" prop="maxLossCount">
-          <el-input v-model="form.maxLossCount" placeholder="请输入最大loss数量" />
+          <el-input
+            v-model="form.maxLossCount"
+            placeholder="请输入最大loss数量"
+          />
         </el-form-item>
         <el-form-item label="loss比率(单位%)" prop="lossRate">
-          <el-input v-model="form.lossRate" placeholder="请输入loss比率(单位%)" />
+          <el-input
+            v-model="form.lossRate"
+            placeholder="请输入loss比率(单位%)"
+          />
         </el-form-item>
         <el-form-item label="冗余量" prop="lossRedundance">
           <el-input v-model="form.lossRedundance" placeholder="请输入冗余量" />
@@ -109,10 +142,19 @@
 </template>
 
 <script>
-import { listLoss, getLoss, delLoss, addLoss, updateLoss } from "@/api/mes/md/productLoss";
-
+import {
+  listLoss,
+  getLoss,
+  delLoss,
+  addLoss,
+  updateLoss,
+} from "@/api/mes/md/productLoss";
+import ClientSelect from "@/components/clientSelect/single.vue";
 export default {
   name: "Loss",
+  components: {
+    ClientSelect,
+  },
   data() {
     return {
       // 遮罩层
@@ -143,18 +185,17 @@ export default {
         maxLossCount: null,
         lossRate: null,
         lossRedundance: null,
-        remark: null
+        remark: null,
       },
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      },
+      rules: {},
     };
   },
   props: {
     optType: undefined,
-    itemId: undefined
+    itemId: undefined,
   },
   created() {
     this.getList();
@@ -163,7 +204,7 @@ export default {
     /** 查询产品loss配置列表 */
     getList() {
       this.loading = true;
-      listLoss(this.queryParams).then(response => {
+      listLoss(this.queryParams).then((response) => {
         this.lossList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -180,11 +221,12 @@ export default {
         productLossId: null,
         itemId: null,
         customerId: null,
+        customerName: null,
         segmentCount: null,
         maxLossCount: null,
         lossRate: null,
         lossRedundance: null,
-        remark: null
+        remark: null,
       };
       this.resetForm("form");
     },
@@ -200,9 +242,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.productLossId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.productLossId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -213,8 +255,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const productLossId = row.productLossId || this.ids
-      getLoss(productLossId).then(response => {
+      const productLossId = row.productLossId || this.ids;
+      getLoss(productLossId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改产品loss配置";
@@ -222,17 +264,17 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.productLossId != null) {
-            updateLoss(this.form).then(response => {
+            updateLoss(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            this.form.itemId = this.itemId
-            addLoss(this.form).then(response => {
+            this.form.itemId = this.itemId;
+            addLoss(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -241,22 +283,42 @@ export default {
         }
       });
     },
+
+    onClientSelect(row) {
+      if (row != undefined && row != null) {
+        this.form.customerId = row.clientId;
+        this.form.customerName = row.clientName;
+      }
+    },
+    openClientSelect() {
+      this.$refs["ClientSelectRef"].showFlag = true;
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const productLossIds = row.productLossId || this.ids;
-      this.$modal.confirm('是否确认删除产品loss配置编号为"' + productLossIds + '"的数据项？').then(function() {
+      this.$modal
+        .confirm(
+          '是否确认删除产品loss配置编号为"' + productLossIds + '"的数据项？'
+        )
+        .then(function () {
           return delLoss(productLossIds);
-      }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('md/loss/export', {
-        ...this.queryParams
-      }, `loss_${new Date().getTime()}.xlsx`)
-    }
-  }
+      this.download(
+        "md/loss/export",
+        {
+          ...this.queryParams,
+        },
+        `loss_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>

src/views/mes/md/sizegroup/item/index.vue

+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="80px"
+    >
+      <el-form-item label="尺码组ID" prop="sizeGroupId">
+        <el-input
+          v-model="queryParams.sizeGroupId"
+          placeholder="请输入尺码组ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="明细序号" prop="sizeIndex">
+        <el-input
+          v-model="queryParams.sizeIndex"
+          placeholder="请输入尺码组明细序号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="尺码名称" prop="sizeName">
+        <el-input
+          v-model="queryParams.sizeName"
+          placeholder="请输入尺码名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="显示名称" prop="sizeDisplayName">
+        <el-input
+          v-model="queryParams.sizeDisplayName"
+          placeholder="请输入显示名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['md:item:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['md:item:edit']"
+          >修改</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['md:item:remove']"
+          >删除</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['md:item:export']"
+          >导出</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="itemList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column label="尺码组明细ID" align="center" prop="sizeGroupItemId" />
+      <el-table-column label="尺码组ID" align="center" prop="sizeGroupId" /> -->
+      <el-table-column
+        label="序号"
+        align="center"
+        prop="sizeIndex"
+        width="80"
+      />
+      <el-table-column label="尺码名称" align="center" prop="sizeName" />
+      <el-table-column label="显示名称" align="center" prop="sizeDisplayName" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column
+        label="操作"
+        align="center"
+        width="120"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['md:item:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['md:item:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改尺码组明细对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <!-- <el-form-item label="尺码组ID" prop="sizeGroupId">
+          <el-input v-model="form.sizeGroupId" placeholder="请输入尺码组ID" />
+        </el-form-item> -->
+        <el-form-item label="尺码名称" prop="sizeName">
+          <el-input v-model="form.sizeName" placeholder="请输入尺码名称" />
+        </el-form-item>
+        <el-form-item label="显示名称" prop="sizeDisplayName">
+          <el-input
+            v-model="form.sizeDisplayName"
+            placeholder="请输入显示名称"
+          />
+        </el-form-item>
+        <el-form-item label="明细序号" prop="sizeIndex">
+          <el-input-number
+            v-model="form.sizeIndex"
+            placeholder="请输入尺码组明细序号"
+          />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listItem,
+  getItem,
+  delItem,
+  addItem,
+  updateItem,
+} from "@/api/mes/md/sizeGroupItem";
+
+export default {
+  name: "Item",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 尺码组明细表格数据
+      itemList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        sizeGroupId: null,
+        sizeIndex: null,
+        sizeName: null,
+        sizeDisplayName: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询尺码组明细列表 */
+    getList() {
+      this.loading = true;
+      listItem(this.queryParams).then((response) => {
+        this.itemList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        sizeGroupItemId: null,
+        sizeGroupId: null,
+        sizeIndex: null,
+        sizeName: null,
+        sizeDisplayName: null,
+        remark: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.sizeGroupItemId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加尺码组明细";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const sizeGroupItemId = row.sizeGroupItemId || this.ids;
+      getItem(sizeGroupItemId).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改尺码组明细";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.sizeGroupItemId != null) {
+            updateItem(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addItem(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const sizeGroupItemIds = row.sizeGroupItemId || this.ids;
+      this.$modal
+        .confirm(
+          '是否确认删除尺码组明细编号为"' + sizeGroupItemIds + '"的数据项？'
+        )
+        .then(function () {
+          return delItem(sizeGroupItemIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "md/item/export",
+        {
+          ...this.queryParams,
+        },
+        `item_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>

src/views/mes/proofing/proofingApply.vue

@@ -131,7 +131,7 @@
       default-expand-all
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
-      <el-table-column label="工单编码" width="180" prop="workorderCode" >
+      <el-table-column label="样品编码" width="180" prop="proofing_apply_no" >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -141,7 +141,7 @@
           >{{scope.row.workorderCode}}</el-button>
         </template>
       </el-table-column>
-      <el-table-column label="工单名称" width="200" align="center" prop="workorderName" :show-overflow-tooltip="true"/>
+      <el-table-column label="产品名称" width="200" align="center" prop="productName" :show-overflow-tooltip="true"/>
       <el-table-column label="工单类型" align="center" prop="workorderType" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.mes_workorder_type" :value="scope.row.workorderType"/>

src/views/mes/proofing/proofingInfo.vue

@@ -2,10 +2,15 @@
   <div class="form-page">
     <div class="page-title">打样申请</div>
     
+      
     <!-- <div class="page-query-form">
       
     </div> -->
     <div class="query-card">
+      <el-row>
+        <el-button size="small"  type="default">返回</el-button>
+        <el-button  size="small" type="primary">保存</el-button>
+      </el-row>
       <div class="query-card-title">基本信息</div>
       <div class="query-card__body">
         <el-form
@@ -17,9 +22,9 @@
         >
           <el-row :gutter="12">
             <el-col :span="6">
-              <el-form-item label="申请单号" prop="proofing_apply_no">
+              <el-form-item label="申请单号" prop="proofingApplyNo">
                 <el-input
-                  v-model="form.proofing_apply_no"
+                  v-model="form.proofingApplyNo"
                   placeholder="自动生成"
                   disabled
                 />
@@ -59,33 +64,33 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="样品名称" prop="proofing_apply_sample_cn_name">
+              <el-form-item label="中文名称" prop="sample_cn_name">
                 <el-input
-                  v-model="form.proofing_apply_sample_cn_name"
+                  v-model="form.sample_cn_name"
                   placeholder="请输入样品中文名称"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="样品英文" prop="proofing_apply_sample_en_name">
+              <el-form-item label="英文名称" prop="sample_en_name">
                 <el-input
-                  v-model="form.proofing_apply_sample_en_name"
+                  v-model="form.sample_en_name"
                   placeholder="请输入样品英文名称"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="样品规格" prop="proofing_apply_sample_size">
+              <el-form-item label="样品规格" prop="sample_specification">
                 <el-input
-                  v-model="form.proofing_apply_sample_en_name"
+                  v-model="form.sample_specification"
                   placeholder="请输入样品规格"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="样品数量" prop="proofing_apply_sample_num">
+              <el-form-item label="样品数量" prop="sample_num">
                 <el-input
-                  v-model="form.proofing_apply_sample_num"
+                  v-model="form.sample_num"
                   placeholder="请输入样品数量"
                 />
               </el-form-item>
@@ -110,7 +115,7 @@
             <el-col :span="6">
               <el-form-item label="分配方式" prop="modality">
                 <el-select
-                  v-model="queryParams.proofing_apply_allocation_type"
+                  v-model="queryParams.modality"
                   clearable
                   placeholder="请选择分配方式"
                 >
@@ -125,18 +130,18 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="表面处理" prop="proofing_apply_surface_treatment">
+              <el-form-item label="表面处理" prop="surface_treatment">
                 <el-input
-                  v-model="form.proofing_apply_surface_treatment"
+                  v-model="form.surface_treatment"
                   placeholder="请输入表面处理"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="完成日期" prop="proofing_apply_complete_date">
+              <el-form-item label="完成日期" prop="finish_date">
                 <el-date-picker
                   clearable
-                  v-model="queryParams.proofing_apply_complete_date"
+                  v-model="queryParams.finish_date"
                   type="date"
                   value-format="yyyy-MM-dd"
                   placeholder="请选择完成日期"
@@ -145,10 +150,10 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="版面需求时间" prop="proofing_apply_page_need_time">
+              <el-form-item label="版面需求时间" prop="requirement_date">
                 <el-date-picker
                   clearable
-                  v-model="queryParams.proofing_apply_page_need_time"
+                  v-model="queryParams.requirement_date"
                   type="date"
                   value-format="yyyy-MM-dd"
                   placeholder="请选择版面需求时间"
@@ -329,14 +334,14 @@ export default {
 }
 .query-card {
   margin: 0 40px 20px;
-  border: 1px solid #e3e3e3;
+  // border: 1px solid #e3e3e3;
   border-radius: 5px;
   .query-card-title {
     line-height: 40px;
     font-size: 16px;
     font-weight: 600;
     padding-left: 10px;
-    border-top: 1px solid #e3e3e3;
+    // border-top: 1px solid #e3e3e3;
     &:first-child {
       border: none;
     }