雷海东 / factory-web · 提交

转到一个项目

作者 雷海东
提交 52e9ac24005d5581e127953efa165342c6c04919 1 个父辈 199a27b8

新

内嵌 并排对比
正在显示 14 个修改的文件 包含 190 行增加 和 12 行删除
不能预览此文件类型
@@ -10,8 +10,8 @@ @@ -10,8 +10,8 @@
10 </a-form-item> 10 </a-form-item>
11 </a-col> 11 </a-col>
12 <a-col :span="12"> 12 <a-col :span="12">
13 - <a-form-item label="交货日期">  
14 - <j-date v-model="queryParam.deliveryTime" placeholder="请选择交货日期" /> 13 + <a-form-item label="客户料号">
  14 + <j-input placeholder="请输入客户料号" v-model="queryParam.partNumber"></j-input>
15 </a-form-item> 15 </a-form-item>
16 </a-col> 16 </a-col>
17 <a-col :xl="6" :lg="7" :md="8" :sm="24"> 17 <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -133,6 +133,17 @@ @@ -133,6 +133,17 @@
133 } 133 }
134 }, 134 },
135 { 135 {
  136 + title:'招标号',
  137 + align:"center",
  138 + dataIndex: 'tenderNumber',
  139 +
  140 + },
  141 + {
  142 + title:'客户料号',
  143 + align:"center",
  144 + dataIndex: 'partNumber'
  145 + },
  146 + {
136 title:'合同编号', 147 title:'合同编号',
137 align:"center", 148 align:"center",
138 dataIndex: 'bianhao' 149 dataIndex: 'bianhao'
@@ -121,7 +121,17 @@ @@ -121,7 +121,17 @@
121 return parseInt(index)+1; 121 return parseInt(index)+1;
122 } 122 }
123 }, 123 },
  124 + {
  125 + title:'招标号',
  126 + align:"center",
  127 + dataIndex: 'tenderNumber',
124 128
  129 + },
  130 + {
  131 + title:'客户料号',
  132 + align:"center",
  133 + dataIndex: 'partNumber'
  134 + },
125 { 135 {
126 title:'开票时间', 136 title:'开票时间',
127 align:"center", 137 align:"center",
@@ -122,6 +122,42 @@ @@ -122,6 +122,42 @@
122 } 122 }
123 }, 123 },
124 { 124 {
  125 + title:'招标号',
  126 + align:"center",
  127 + dataIndex: 'tenderNumber',
  128 +
  129 + },
  130 + {
  131 + title:'客户',
  132 + align:"center",
  133 + dataIndex: 'customer'
  134 + },
  135 + {
  136 + title:'客户采购',
  137 + align:"center",
  138 + dataIndex: 'procurement'
  139 + },
  140 + {
  141 + title:'客户料号',
  142 + align:"center",
  143 + dataIndex: 'partNumber'
  144 + },
  145 + {
  146 + title:'物料描述',
  147 + align:"center",
  148 + dataIndex: 'description'
  149 + },
  150 + {
  151 + title:'品名',
  152 + align:"center",
  153 + dataIndex: 'productname'
  154 + },
  155 + {
  156 + title:'规格',
  157 + align:"center",
  158 + dataIndex: 'specifications'
  159 + },
  160 + {
125 title:'厂商', 161 title:'厂商',
126 align:"center", 162 align:"center",
127 dataIndex: 'chang' 163 dataIndex: 'chang'
@@ -149,7 +185,9 @@ @@ -149,7 +185,9 @@
149 { 185 {
150 title:'询价人', 186 title:'询价人',
151 align:"center", 187 align:"center",
152 - dataIndex: 'inquirer' 188 + dataIndex: 'inquirer',
  189 + width:60,
  190 + fixed:"right"
153 }, 191 },
154 { 192 {
155 title: '操作', 193 title: '操作',
@@ -185,6 +223,13 @@ @@ -185,6 +223,13 @@
185 }, 223 },
186 getSuperFieldList(){ 224 getSuperFieldList(){
187 let fieldList=[]; 225 let fieldList=[];
  226 + fieldList.push({type:'string',value:'tenderNumber',text:'招标号'})
  227 + fieldList.push({type:'string',value:'customer',text:'客户'})
  228 + fieldList.push({type:'string',value:'procurement',text:'客户采购'})
  229 + fieldList.push({type:'string',value:'partNumber',text:'客户料号'})
  230 + fieldList.push({type:'string',value:'description',text:'物料描述'})
  231 + fieldList.push({type:'string',value:'productname',text:'品名'})
  232 + fieldList.push({type:'string',value:'specifications',text:'规格'})
188 fieldList.push({type:'string',value:'chang',text:'厂商'}) 233 fieldList.push({type:'string',value:'chang',text:'厂商'})
189 fieldList.push({type:'number',value:'price',text:'价格'}) 234 fieldList.push({type:'number',value:'price',text:'价格'})
190 fieldList.push({type:'number',value:'taxIncluded',text:'含税运'}) 235 fieldList.push({type:'number',value:'taxIncluded',text:'含税运'})
@@ -122,6 +122,17 @@ @@ -122,6 +122,17 @@
122 } 122 }
123 }, 123 },
124 { 124 {
  125 + title:'招标号',
  126 + align:"center",
  127 + dataIndex: 'tenderNumber',
  128 +
  129 + },
  130 + {
  131 + title:'客户料号',
  132 + align:"center",
  133 + dataIndex: 'partNumber'
  134 + },
  135 + {
125 title:'采购厂商', 136 title:'采购厂商',
126 align:"center", 137 align:"center",
127 dataIndex: 'cgManufacturer' 138 dataIndex: 'cgManufacturer'
@@ -122,6 +122,17 @@ @@ -122,6 +122,17 @@
122 } 122 }
123 }, 123 },
124 { 124 {
  125 + title:'招标号',
  126 + align:"center",
  127 + dataIndex: 'tenderNumber',
  128 +
  129 + },
  130 + {
  131 + title:'客户料号',
  132 + align:"center",
  133 + dataIndex: 'partNumber'
  134 + },
  135 + {
125 title:'投标价格（不含税）', 136 title:'投标价格（不含税）',
126 align:"center", 137 align:"center",
127 dataIndex: 'bidPrice' 138 dataIndex: 'bidPrice'
@@ -4,6 +4,22 @@ @@ -4,6 +4,22 @@
4 <div class="table-page-search-wrapper"> 4 <div class="table-page-search-wrapper">
5 <a-form layout="inline" @keyup.enter.native="searchQuery"> 5 <a-form layout="inline" @keyup.enter.native="searchQuery">
6 <a-row :gutter="24"> 6 <a-row :gutter="24">
  7 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  8 + <a-form-item label="招标号">
  9 + <j-input placeholder="请输入招标号" v-model="queryParam.tenderNumber"></j-input>
  10 + </a-form-item>
  11 + </a-col>
  12 + <a-col :span="12" :xl="6" :lg="7" :md="8" :sm="24">
  13 + <a-form-item label="客户料号">
  14 + <j-input placeholder="请输入客户料号" v-model="queryParam.partNumber"></j-input>
  15 + </a-form-item>
  16 + </a-col>
  17 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  18 + <span style="float: right; overflow: hidden" class="table-page-search-submitButtons">
  19 + <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
  20 + <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
  21 + </span>
  22 + </a-col>
7 </a-row> 23 </a-row>
8 </a-form> 24 </a-form>
9 </div> 25 </div>
@@ -126,8 +142,8 @@ @@ -126,8 +142,8 @@
126 title:'招标号', 142 title:'招标号',
127 align:"center", 143 align:"center",
128 dataIndex: 'tenderNumber', 144 dataIndex: 'tenderNumber',
129 - width:100,  
130 - fixed:"left", 145 + width:60,
  146 + fixed:"left"
131 }, 147 },
132 { 148 {
133 title:'客户', 149 title:'客户',
@@ -223,7 +239,7 @@ @@ -223,7 +239,7 @@
223 dataIndex: 'huoqiTime' 239 dataIndex: 'huoqiTime'
224 }, 240 },
225 { 241 {
226 - title:'对接人员', 242 + title:'对接人',
227 align:"center", 243 align:"center",
228 dataIndex: 'contactPerson' 244 dataIndex: 'contactPerson'
229 }, 245 },
@@ -401,8 +417,8 @@ @@ -401,8 +417,8 @@
401 title:'毛利润', 417 title:'毛利润',
402 align:"center", 418 align:"center",
403 dataIndex: 'profit', 419 dataIndex: 'profit',
404 - fixed:'right',  
405 - width:60 420 + width:60,
  421 + fixed:"right"
406 }, 422 },
407 { 423 {
408 title: '操作', 424 title: '操作',
@@ -457,7 +473,7 @@ @@ -457,7 +473,7 @@
457 fieldList.push({type:'number',value:'price',text:'价格'}) 473 fieldList.push({type:'number',value:'price',text:'价格'})
458 fieldList.push({type:'number',value:'taxIncluded',text:'含税运'}) 474 fieldList.push({type:'number',value:'taxIncluded',text:'含税运'})
459 fieldList.push({type:'string',value:'huoqiTime',text:'货期'}) 475 fieldList.push({type:'string',value:'huoqiTime',text:'货期'})
460 - fieldList.push({type:'string',value:'contactPerson',text:'对接人员'}) 476 + fieldList.push({type:'string',value:'contactPerson',text:'对接人'})
461 fieldList.push({type:'string',value:'inquirer',text:'询价人'}) 477 fieldList.push({type:'string',value:'inquirer',text:'询价人'})
462 fieldList.push({type:'number',value:'bidPrice',text:'投标价格（不含税）'}) 478 fieldList.push({type:'number',value:'bidPrice',text:'投标价格（不含税）'})
463 fieldList.push({type:'number',value:'zhongPrice',text:'中标单价'}) 479 fieldList.push({type:'number',value:'zhongPrice',text:'中标单价'})
@@ -4,6 +4,16 @@ @@ -4,6 +4,16 @@
4 <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail"> 4 <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
5 <a-row> 5 <a-row>
6 <a-col :span="24"> 6 <a-col :span="24">
  7 + <a-form-model-item label="招标号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tenderNumber">
  8 + <a-input v-model="model.tenderNumber" placeholder="请输入招标号"></a-input>
  9 + </a-form-model-item>
  10 + </a-col>
  11 + <a-col :span="24">
  12 + <a-form-model-item label="客户料号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partNumber">
  13 + <a-input v-model="model.partNumber" placeholder="请输入客户料号"></a-input>
  14 + </a-form-model-item>
  15 + </a-col>
  16 + <a-col :span="24">
7 <a-form-model-item label="合同编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bianhao"> 17 <a-form-model-item label="合同编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bianhao">
8 <a-input v-model="model.bianhao" placeholder="请输入合同编号" ></a-input> 18 <a-input v-model="model.bianhao" placeholder="请输入合同编号" ></a-input>
9 </a-form-model-item> 19 </a-form-model-item>
@@ -3,7 +3,16 @@ @@ -3,7 +3,16 @@
3 <j-form-container :disabled="formDisabled"> 3 <j-form-container :disabled="formDisabled">
4 <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail"> 4 <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
5 <a-row> 5 <a-row>
6 - 6 + <a-col :span="24">
  7 + <a-form-model-item label="招标号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tenderNumber">
  8 + <a-input v-model="model.tenderNumber" placeholder="请输入招标号"></a-input>
  9 + </a-form-model-item>
  10 + </a-col>
  11 + <a-col :span="24">
  12 + <a-form-model-item label="客户料号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partNumber">
  13 + <a-input v-model="model.partNumber" placeholder="请输入客户料号"></a-input>
  14 + </a-form-model-item>
  15 + </a-col>
7 <a-col :span="24"> 16 <a-col :span="24">
8 <a-form-model-item label="开票时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="invoicingTime"> 17 <a-form-model-item label="开票时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="invoicingTime">
9 <j-date placeholder="请选择开票时间" v-model="model.invoicingTime" style="width: 100%" /> 18 <j-date placeholder="请选择开票时间" v-model="model.invoicingTime" style="width: 100%" />
@@ -4,6 +4,41 @@ @@ -4,6 +4,41 @@
4 <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail"> 4 <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
5 <a-row> 5 <a-row>
6 <a-col :span="24"> 6 <a-col :span="24">
  7 + <a-form-model-item label="招标号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tenderNumber">
  8 + <a-input v-model="model.tenderNumber" placeholder="请输入招标号" ></a-input>
  9 + </a-form-model-item>
  10 + </a-col>
  11 + <a-col :span="24">
  12 + <a-form-model-item label="客户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="customer">
  13 + <a-input v-model="model.customer" placeholder="请输入客户" ></a-input>
  14 + </a-form-model-item>
  15 + </a-col>
  16 + <a-col :span="24">
  17 + <a-form-model-item label="客户采购" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="procurement">
  18 + <a-input v-model="model.procurement" placeholder="请输入客户采购" ></a-input>
  19 + </a-form-model-item>
  20 + </a-col>
  21 + <a-col :span="24">
  22 + <a-form-model-item label="客户料号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partNumber">
  23 + <a-input v-model="model.partNumber" placeholder="请输入客户料号" ></a-input>
  24 + </a-form-model-item>
  25 + </a-col>
  26 + <a-col :span="24">
  27 + <a-form-model-item label="物料描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description">
  28 + <a-input v-model="model.description" placeholder="请输入物料描述" ></a-input>
  29 + </a-form-model-item>
  30 + </a-col>
  31 + <a-col :span="24">
  32 + <a-form-model-item label="品名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productname">
  33 + <a-input v-model="model.productname" placeholder="请输入品名" ></a-input>
  34 + </a-form-model-item>
  35 + </a-col>
  36 + <a-col :span="24">
  37 + <a-form-model-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="specifications">
  38 + <a-input v-model="model.specifications" placeholder="请输入规格" ></a-input>
  39 + </a-form-model-item>
  40 + </a-col>
  41 + <a-col :span="24">
7 <a-form-model-item label="厂商" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="chang"> 42 <a-form-model-item label="厂商" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="chang">
8 <a-input v-model="model.chang" placeholder="请输入厂商" ></a-input> 43 <a-input v-model="model.chang" placeholder="请输入厂商" ></a-input>
9 </a-form-model-item> 44 </a-form-model-item>
@@ -4,6 +4,16 @@ @@ -4,6 +4,16 @@
4 <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail"> 4 <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
5 <a-row> 5 <a-row>
6 <a-col :span="24"> 6 <a-col :span="24">
  7 + <a-form-model-item label="招标号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tenderNumber">
  8 + <a-input v-model="model.tenderNumber" placeholder="请输入招标号"></a-input>
  9 + </a-form-model-item>
  10 + </a-col>
  11 + <a-col :span="24">
  12 + <a-form-model-item label="客户料号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partNumber">
  13 + <a-input v-model="model.partNumber" placeholder="请输入客户料号"></a-input>
  14 + </a-form-model-item>
  15 + </a-col>
  16 + <a-col :span="24">
7 <a-form-model-item label="采购厂商" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cgManufacturer"> 17 <a-form-model-item label="采购厂商" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cgManufacturer">
8 <a-input v-model="model.cgManufacturer" placeholder="请输入采购厂商" ></a-input> 18 <a-input v-model="model.cgManufacturer" placeholder="请输入采购厂商" ></a-input>
9 </a-form-model-item> 19 </a-form-model-item>
@@ -4,6 +4,16 @@ @@ -4,6 +4,16 @@
4 <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail"> 4 <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
5 <a-row> 5 <a-row>
6 <a-col :span="24"> 6 <a-col :span="24">
  7 + <a-form-model-item label="招标号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tenderNumber">
  8 + <a-input v-model="model.tenderNumber" placeholder="请输入招标号"></a-input>
  9 + </a-form-model-item>
  10 + </a-col>
  11 + <a-col :span="24">
  12 + <a-form-model-item label="客户料号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partNumber">
  13 + <a-input v-model="model.partNumber" placeholder="请输入客户料号"></a-input>
  14 + </a-form-model-item>
  15 + </a-col>
  16 + <a-col :span="24">
7 <a-form-model-item label="投标价格（不含税）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bidPrice"> 17 <a-form-model-item label="投标价格（不含税）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bidPrice">
8 <a-input-number v-model="model.bidPrice" placeholder="请输入投标价格（不含税）" style="width: 100%" /> 18 <a-input-number v-model="model.bidPrice" placeholder="请输入投标价格（不含税）" style="width: 100%" />
9 </a-form-model-item> 19 </a-form-model-item>
@@ -99,8 +99,8 @@ @@ -99,8 +99,8 @@
99 </a-form-model-item> 99 </a-form-model-item>
100 </a-col> 100 </a-col>
101 <a-col :span="24"> 101 <a-col :span="24">
102 - <a-form-model-item label="对接人员" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="contactPerson">  
103 - <a-input v-model="model.contactPerson" placeholder="请输入对接人员" ></a-input> 102 + <a-form-model-item label="对接人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="contactPerson">
  103 + <a-input v-model="model.contactPerson" placeholder="请输入对接人" ></a-input>
104 </a-form-model-item> 104 </a-form-model-item>
105 </a-col> 105 </a-col>
106 <a-col :span="24"> 106 <a-col :span="24">