打样申请页面修改

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

 <template>
   <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;
     }