雷海东 / factory-web · 提交

转到一个项目

作者 雷海东
提交 9d5f48902f7a7189e79e3015507fb5c5e1b9c772 1 个父辈 dc933c7d

新

内嵌 并排对比
正在显示 5 个修改的文件 包含 118 行增加 和 15 行删除
不能预览此文件类型
@@ -132,6 +132,7 @@ @@ -132,6 +132,7 @@
132 dataIndex: '', 132 dataIndex: '',
133 key:'rowIndex', 133 key:'rowIndex',
134 width:60, 134 width:60,
  135 + fixed:'left',
135 align:"center", 136 align:"center",
136 customRender:function (t,r,index) { 137 customRender:function (t,r,index) {
137 return parseInt(index)+1; 138 return parseInt(index)+1;
@@ -140,7 +141,9 @@ @@ -140,7 +141,9 @@
140 { 141 {
141 title:'招标号', 142 title:'招标号',
142 align:"center", 143 align:"center",
143 - dataIndex: 'tenderNumber' 144 + dataIndex: 'tenderNumber',
  145 + fixed:'left',
  146 + width:60
144 }, 147 },
145 { 148 {
146 title:'客户', 149 title:'客户',
@@ -196,12 +199,37 @@ @@ -196,12 +199,37 @@
196 } 199 }
197 }, 200 },
198 { 201 {
199 - title:'备注（品牌要求）', 202 + title:'品牌',
  203 + align:"center",
  204 + dataIndex: 'brand'
  205 + },
  206 + {
  207 + title:'工作令',
  208 + align:"center",
  209 + dataIndex: 'workOrder'
  210 + },
  211 + {
  212 + title:'进口国产标识',
  213 + align:"center",
  214 + dataIndex: 'identification'
  215 + },
  216 + {
  217 + title:'WBS',
  218 + align:"center",
  219 + dataIndex: 'wbs'
  220 + },
  221 + {
  222 + title:'评审结果',
  223 + align:"center",
  224 + dataIndex: 'result'
  225 + },
  226 + {
  227 + title:'备注',
200 align:"center", 228 align:"center",
201 dataIndex: 'notes' 229 dataIndex: 'notes'
202 }, 230 },
203 { 231 {
204 - title:'客户设计', 232 + title:'设计人员姓名',
205 align:"center", 233 align:"center",
206 dataIndex: 'design' 234 dataIndex: 'design'
207 }, 235 },
@@ -27,11 +27,11 @@ @@ -27,11 +27,11 @@
27 27
28 <!-- 操作按钮区域 --> 28 <!-- 操作按钮区域 -->
29 <div class="table-operator"> 29 <div class="table-operator">
30 - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> 30 + <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
31 <a-button type="primary" icon="download" @click="handleExportXls('tbl_trad_zong')">导出</a-button> 31 <a-button type="primary" icon="download" @click="handleExportXls('tbl_trad_zong')">导出</a-button>
32 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> 32 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
33 <a-button type="primary" icon="import">导入</a-button> 33 <a-button type="primary" icon="import">导入</a-button>
34 - </a-upload> 34 + </a-upload> -->
35 <!-- 高级查询区域 --> 35 <!-- 高级查询区域 -->
36 <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query> 36 <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
37 <a-dropdown v-if="selectedRowKeys.length > 0"> 37 <a-dropdown v-if="selectedRowKeys.length > 0">
@@ -199,12 +199,37 @@ @@ -199,12 +199,37 @@
199 } 199 }
200 }, 200 },
201 { 201 {
202 - title:'备注（品牌要求）', 202 + title:'品牌',
  203 + align:"center",
  204 + dataIndex: 'brand'
  205 + },
  206 + {
  207 + title:'工作令',
  208 + align:"center",
  209 + dataIndex: 'workOrder'
  210 + },
  211 + {
  212 + title:'进口国产标识',
  213 + align:"center",
  214 + dataIndex: 'identification'
  215 + },
  216 + {
  217 + title:'WBS',
  218 + align:"center",
  219 + dataIndex: 'wbs'
  220 + },
  221 + {
  222 + title:'评审结果',
  223 + align:"center",
  224 + dataIndex: 'result'
  225 + },
  226 + {
  227 + title:'备注',
203 align:"center", 228 align:"center",
204 dataIndex: 'notes' 229 dataIndex: 'notes'
205 }, 230 },
206 { 231 {
207 - title:'客户设计', 232 + title:'设计人员姓名',
208 align:"center", 233 align:"center",
209 dataIndex: 'design' 234 dataIndex: 'design'
210 }, 235 },
@@ -59,13 +59,38 @@ @@ -59,13 +59,38 @@
59 </a-form-model-item> 59 </a-form-model-item>
60 </a-col> 60 </a-col>
61 <a-col :span="24"> 61 <a-col :span="24">
62 - <a-form-model-item label="备注（品牌要求）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="notes">  
63 - <a-input v-model="model.notes" placeholder="请输入备注（品牌要求）"></a-input> 62 + <a-form-model-item label="品牌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="brand">
  63 + <a-input v-model="model.brand" placeholder="请输入品牌"></a-input>
64 </a-form-model-item> 64 </a-form-model-item>
65 </a-col> 65 </a-col>
66 <a-col :span="24"> 66 <a-col :span="24">
67 - <a-form-model-item label="客户设计" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="design">  
68 - <a-input v-model="model.design" placeholder="请输入客户设计"></a-input> 67 + <a-form-model-item label="工作令" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workOrder">
  68 + <a-input v-model="model.workOrder" placeholder="请输入工作令"></a-input>
  69 + </a-form-model-item>
  70 + </a-col>
  71 + <a-col :span="24">
  72 + <a-form-model-item label="进口国产标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="identification">
  73 + <a-input v-model="model.identification" placeholder="请输入进口国产标识"></a-input>
  74 + </a-form-model-item>
  75 + </a-col>
  76 + <a-col :span="24">
  77 + <a-form-model-item label="WBS" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wbs">
  78 + <a-input v-model="model.wbs" placeholder="请输入WBS"></a-input>
  79 + </a-form-model-item>
  80 + </a-col>
  81 + <a-col :span="24">
  82 + <a-form-model-item label="评审结果" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="result">
  83 + <a-input v-model="model.result" placeholder="请输入评审结果"></a-input>
  84 + </a-form-model-item>
  85 + </a-col>
  86 + <a-col :span="24">
  87 + <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="notes">
  88 + <a-input v-model="model.notes" placeholder="请输入备注"></a-input>
  89 + </a-form-model-item>
  90 + </a-col>
  91 + <a-col :span="24">
  92 + <a-form-model-item label="设计人员姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="design">
  93 + <a-input v-model="model.design" placeholder="请输入设计人员姓名"></a-input>
69 </a-form-model-item> 94 </a-form-model-item>
70 </a-col> 95 </a-col>
71 <a-col :span="24"> 96 <a-col :span="24">
@@ -59,13 +59,38 @@ @@ -59,13 +59,38 @@
59 </a-form-model-item> 59 </a-form-model-item>
60 </a-col> 60 </a-col>
61 <a-col :span="24"> 61 <a-col :span="24">
62 - <a-form-model-item label="备注（品牌要求）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="notes">  
63 - <a-input v-model="model.notes" placeholder="请输入备注（品牌要求）" ></a-input> 62 + <a-form-model-item label="品牌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="brand">
  63 + <a-input v-model="model.brand" placeholder="请输入品牌"></a-input>
64 </a-form-model-item> 64 </a-form-model-item>
65 </a-col> 65 </a-col>
66 <a-col :span="24"> 66 <a-col :span="24">
67 - <a-form-model-item label="客户设计" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="design">  
68 - <a-input v-model="model.design" placeholder="请输入客户设计" ></a-input> 67 + <a-form-model-item label="工作令" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workOrder">
  68 + <a-input v-model="model.workOrder" placeholder="请输入工作令"></a-input>
  69 + </a-form-model-item>
  70 + </a-col>
  71 + <a-col :span="24">
  72 + <a-form-model-item label="进口国产标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="identification">
  73 + <a-input v-model="model.identification" placeholder="请输入进口国产标识"></a-input>
  74 + </a-form-model-item>
  75 + </a-col>
  76 + <a-col :span="24">
  77 + <a-form-model-item label="WBS" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wbs">
  78 + <a-input v-model="model.wbs" placeholder="请输入WBS"></a-input>
  79 + </a-form-model-item>
  80 + </a-col>
  81 + <a-col :span="24">
  82 + <a-form-model-item label="评审结果" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="result">
  83 + <a-input v-model="model.result" placeholder="请输入评审结果"></a-input>
  84 + </a-form-model-item>
  85 + </a-col>
  86 + <a-col :span="24">
  87 + <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="notes">
  88 + <a-input v-model="model.notes" placeholder="请输入备注"></a-input>
  89 + </a-form-model-item>
  90 + </a-col>
  91 + <a-col :span="24">
  92 + <a-form-model-item label="设计人员姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="design">
  93 + <a-input v-model="model.design" placeholder="请输入设计人员姓名"></a-input>
69 </a-form-model-item> 94 </a-form-model-item>
70 </a-col> 95 </a-col>
71 <a-col :span="24"> 96 <a-col :span="24">