朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 1c106a6c6204b9a709a7cf6228261e7ca978ece2 1 个父辈 66cfd764

商品管理弹窗优化

内嵌 并排对比
正在显示 2 个修改的文件 包含 317 行增加 和 269 行删除
@@ -43,10 +43,10 @@ @@ -43,10 +43,10 @@
43 </el-input> 43 </el-input>
44 </el-col> 44 </el-col>
45 <el-col :offset="1" :span="5"> 45 <el-col :offset="1" :span="5">
46 - <el-button type="primary" icon="el-icon-search" @click="getList()"> 46 + <el-button type="primary" icon="el-icon-search" size="small" @click="getList()">
47 查询 47 查询
48 </el-button> 48 </el-button>
49 - <el-button type="success" icon="el-icon-edit" @click="applyAdd()">新增</el-button> 49 + <el-button type="success" icon="el-icon-edit" size="small" @click="applyAdd()">新增</el-button>
50 </el-col> 50 </el-col>
51 </el-row> 51 </el-row>
52 </el-row> 52 </el-row>
@@ -144,463 +144,465 @@ @@ -144,463 +144,465 @@
144 </el-pagination> 144 </el-pagination>
145 </el-row> 145 </el-row>
146 <el-row> 146 <el-row>
147 - <el-dialog :title="dialogMap[dialogApply]" :visible.sync="apply_dialog.addDialog" width="80%" > 147 + <el-dialog :title="dialogMap[dialogApply]" :visible.sync="apply_dialog.addDialog" width="80%" v-dialog-drag>
148 <el-form :model="addForm" :rules="rules" ref="addForm"> 148 <el-form :model="addForm" :rules="rules" ref="addForm">
  149 + <el-divider content-position="center"> 商品管理必填信息 </el-divider>
149 <el-row> 150 <el-row>
150 <el-col :span="6"> 151 <el-col :span="6">
151 - <el-form-item label="" :label-width="formLabelWidth" prop="bondedtype">  
152 - <el-input v-model="addForm.bondedtype" autocomplete="off" >  
153 - <template slot="prepend">保税类别</template>  
154 - </el-input>  
155 - </el-form-item>  
156 - </el-col>  
157 - <el-col :span="6">  
158 - <el-form-item label="" :label-width="formLabelWidth" prop="cofgdsno">  
159 - <el-input v-model="addForm.cofgdsno" autocomplete="off" >  
160 - <template slot="prepend">项目编号</template> 152 + <el-form-item label=" " :label-width="formLabelWidth" prop="gdsnm">
  153 + <el-input v-model="addForm.gdsnm" autocomplete="off" size="small">
  154 + <template slot="prepend">商品名称</template>
161 </el-input> 155 </el-input>
162 </el-form-item> 156 </el-form-item>
163 </el-col> 157 </el-col>
164 <el-col :span="6"> 158 <el-col :span="6">
165 - <el-form-item label="" :label-width="formLabelWidth" prop="asdutyrate">  
166 - <el-input v-model="addForm.asdutyrate" autocomplete="off" >  
167 - <template slot="prepend">反补贴税率</template> 159 + <el-form-item label=" " :label-width="formLabelWidth" prop="gdetype">
  160 + <el-input v-model="addForm.gdetype" autocomplete="off" size="small">
  161 + <template slot="prepend">商品类型</template>
168 </el-input> 162 </el-input>
169 </el-form-item> 163 </el-form-item>
170 </el-col> 164 </el-col>
171 <el-col :span="6"> 165 <el-col :span="6">
172 - <el-form-item label="" :label-width="formLabelWidth" prop="atdutyrate">  
173 - <el-input v-model="addForm.atdutyrate" autocomplete="off" >  
174 - <template slot="prepend">反倾销税率</template>  
175 - </el-input>  
176 - </el-form-item>  
177 - </el-col>  
178 - </el-row>  
179 - <el-row>  
180 - <el-col :span="6">  
181 - <el-form-item label="" :label-width="formLabelWidth" prop="gdebc">  
182 - <el-input v-model="addForm.gdebc" autocomplete="off" > 166 + <el-form-item label=" " :label-width="formLabelWidth" prop="gdebc">
  167 + <el-input v-model="addForm.gdebc" autocomplete="off" size="small">
183 <template slot="prepend">商品简码</template> 168 <template slot="prepend">商品简码</template>
184 </el-input> 169 </el-input>
185 </el-form-item> 170 </el-form-item>
186 </el-col> 171 </el-col>
187 <el-col :span="6"> 172 <el-col :span="6">
188 - <el-form-item label="" :label-width="formLabelWidth" prop="gdecd">  
189 - <el-input v-model="addForm.gdecd" autocomplete="off" > 173 + <el-form-item label=" " :label-width="formLabelWidth" prop="gdecd">
  174 + <el-input v-model="addForm.gdecd" autocomplete="off" size="small">
190 <template slot="prepend">商品编码</template> 175 <template slot="prepend">商品编码</template>
191 </el-input> 176 </el-input>
192 </el-form-item> 177 </el-form-item>
193 </el-col> 178 </el-col>
194 - <el-col :span="6">  
195 - <el-form-item label="" :label-width="formLabelWidth" prop="gdetype">  
196 - <el-input v-model="addForm.gdetype" autocomplete="off" >  
197 - <template slot="prepend">商品类型</template>  
198 - </el-input>  
199 - </el-form-item>  
200 - </el-col>  
201 - <el-col :span="6">  
202 - <el-form-item label="" :label-width="formLabelWidth" prop="gdsbrand">  
203 - <el-input v-model="addForm.gdsbrand" autocomplete="off" >  
204 - <template slot="prepend">商品品牌</template>  
205 - </el-input>  
206 - </el-form-item>  
207 - </el-col>  
208 </el-row> 179 </el-row>
209 <el-row> 180 <el-row>
210 <el-col :span="6"> 181 <el-col :span="6">
211 - <el-form-item label="" :label-width="formLabelWidth" prop="gdsmaster">  
212 - <el-input v-model="addForm.gdsmaster" autocomplete="off" >  
213 - <template slot="prepend">货&emsp;&emsp;主</template> 182 + <el-form-item label=" " :label-width="formLabelWidth" prop="itemno">
  183 + <el-input v-model="addForm.itemno" autocomplete="off" size="small">
  184 + <template slot="prepend">项&emsp;&emsp;号</template>
214 </el-input> 185 </el-input>
215 </el-form-item> 186 </el-form-item>
216 </el-col> 187 </el-col>
217 <el-col :span="6"> 188 <el-col :span="6">
218 - <el-form-item label="" :label-width="formLabelWidth" prop="gdsmtno">  
219 - <el-input v-model="addForm.gdsmtno" autocomplete="off" > 189 + <el-form-item label=" " :label-width="formLabelWidth" prop="gdsmtno">
  190 + <el-input v-model="addForm.gdsmtno" autocomplete="off" size="small">
220 <template slot="prepend">商品料号</template> 191 <template slot="prepend">商品料号</template>
221 </el-input> 192 </el-input>
222 </el-form-item> 193 </el-form-item>
223 </el-col> 194 </el-col>
224 <el-col :span="6"> 195 <el-col :span="6">
225 - <el-form-item label="" :label-width="formLabelWidth" prop="gdsnm">  
226 - <el-input v-model="addForm.gdsnm" autocomplete="off" >  
227 - <template slot="prepend">商品名称</template> 196 + <el-form-item label=" " :label-width="formLabelWidth" prop="skucd">
  197 + <el-input v-model="addForm.skucd" autocomplete="off" size="small">
  198 + <template slot="prepend">SKU编码</template>
228 </el-input> 199 </el-input>
229 </el-form-item> 200 </el-form-item>
230 </el-col> 201 </el-col>
231 <el-col :span="6"> 202 <el-col :span="6">
232 - <el-form-item label="" :label-width="formLabelWidth" prop="destinationnatcd">  
233 - <el-input v-model="addForm.destinationnatcd" autocomplete="off" >  
234 - <template slot="prepend">最终目的国</template>  
235 - </el-input> 203 + <el-form-item label=" " :label-width="formLabelWidth" prop="bondedtype">
  204 + <div class="my-text-area">
  205 + <div class="el-input-group__prepend prepand">保税类别</div>
  206 + <el-select v-model="addForm.bondedtype" placeholder="请选择是否虚拟仓库" size="small" style="width: 150px">
  207 + <el-option label="保税" value="100"></el-option>
  208 + <el-option label="非保税" value="101"></el-option>
  209 + </el-select>
  210 + </div>
236 </el-form-item> 211 </el-form-item>
  212 +<!-- <el-form-item label="" :label-width="formLabelWidth" prop="bondedtype">-->
  213 +<!-- <el-input v-model="addForm.bondedtype" autocomplete="off" size="small">-->
  214 +<!-- <template slot="prepend">保税类别</template>-->
  215 +<!-- </el-input>-->
  216 +<!-- </el-form-item>-->
237 </el-col> 217 </el-col>
238 </el-row> 218 </el-row>
239 <el-row> 219 <el-row>
240 <el-col :span="6"> 220 <el-col :span="6">
241 - <el-form-item label="" :label-width="formLabelWidth" prop="putrecseqno">  
242 - <el-input v-model="addForm.putrecseqno" autocomplete="off" >  
243 - <template slot="prepend">备案序号</template> 221 + <el-form-item label=" " :label-width="formLabelWidth" prop="newwt">
  222 + <el-input v-model="addForm.newwt" autocomplete="off" size="small">
  223 + <template slot="prepend">净&emsp;&emsp;重</template>
244 </el-input> 224 </el-input>
245 </el-form-item> 225 </el-form-item>
246 </el-col> 226 </el-col>
247 <el-col :span="6"> 227 <el-col :span="6">
248 - <el-form-item label="" :label-width="formLabelWidth" prop="skucd">  
249 - <el-input v-model="addForm.skucd" autocomplete="off" >  
250 - <template slot="prepend">SKU编码</template> 228 + <el-form-item label=" " :label-width="formLabelWidth" prop="dclunitcd">
  229 + <el-input v-model="addForm.dclunitcd" autocomplete="off" size="small">
  230 + <template slot="prepend">单&emsp;&emsp;位</template>
251 </el-input> 231 </el-input>
252 </el-form-item> 232 </el-form-item>
253 </el-col> 233 </el-col>
254 <el-col :span="6"> 234 <el-col :span="6">
255 - <el-form-item label="" :label-width="formLabelWidth" prop="status">  
256 - <el-input v-model="addForm.status" autocomplete="off" >  
257 - <template slot="prepend">状&emsp;&emsp;态</template> 235 + <el-form-item label=" " :label-width="formLabelWidth" prop="dcluprcamt">
  236 + <el-input v-model="addForm.dcluprcamt" autocomplete="off" size="small">
  237 + <template slot="prepend">单&emsp;&emsp;价</template>
258 </el-input> 238 </el-input>
259 </el-form-item> 239 </el-form-item>
260 </el-col> 240 </el-col>
261 <el-col :span="6"> 241 <el-col :span="6">
262 - <el-form-item label="" :label-width="formLabelWidth" prop="stocknum">  
263 - <el-input v-model="addForm.stocknum" autocomplete="off" >  
264 - <template slot="prepend">库存数量</template> 242 + <el-form-item label=" " :label-width="formLabelWidth" prop="dclurrcd">
  243 + <el-input v-model="addForm.dclurrcd" autocomplete="off" size="small">
  244 + <template slot="prepend">单价单位</template>
265 </el-input> 245 </el-input>
266 </el-form-item> 246 </el-form-item>
267 </el-col> 247 </el-col>
268 </el-row> 248 </el-row>
269 <el-row> 249 <el-row>
270 <el-col :span="6"> 250 <el-col :span="6">
271 - <el-form-item label="" :label-width="formLabelWidth" prop="uncode">  
272 - <el-input v-model="addForm.uncode" autocomplete="off" >  
273 - <template slot="prepend">UN编码</template>  
274 - </el-input>  
275 - </el-form-item>  
276 - </el-col>  
277 - <el-col :span="6">  
278 - <el-form-item label="" :label-width="formLabelWidth" prop="stuff">  
279 - <el-input v-model="addForm.stuff" autocomplete="off" >  
280 - <template slot="prepend">成&emsp;&emsp;份</template> 251 + <el-form-item label=" " :label-width="formLabelWidth" prop="cofgdsno">
  252 + <el-input v-model="addForm.cofgdsno" autocomplete="off" size="small">
  253 + <template slot="prepend">项目编号</template>
281 </el-input> 254 </el-input>
282 </el-form-item> 255 </el-form-item>
283 </el-col> 256 </el-col>
284 <el-col :span="6"> 257 <el-col :span="6">
285 - <el-form-item label="" :label-width="formLabelWidth" prop="updatedat">  
286 - <el-input v-model="addForm.updatedat" autocomplete="off" >  
287 - <template slot="prepend">更新日期</template> 258 + <el-form-item label=" " :label-width="formLabelWidth" prop="asdutyrate">
  259 + <el-input v-model="addForm.asdutyrate" autocomplete="off" size="small">
  260 + <template slot="prepend">反补贴税率</template>
288 </el-input> 261 </el-input>
289 </el-form-item> 262 </el-form-item>
290 </el-col> 263 </el-col>
291 <el-col :span="6"> 264 <el-col :span="6">
292 - <el-form-item label="" :label-width="formLabelWidth" prop="updatedby">  
293 - <el-input v-model="addForm.updatedby" autocomplete="off" >  
294 - <template slot="prepend">更&emsp;新&emsp;人</template> 265 + <el-form-item label=" " :label-width="formLabelWidth" prop="atdutyrate">
  266 + <el-input v-model="addForm.atdutyrate" autocomplete="off" size="small">
  267 + <template slot="prepend">反倾销税率</template>
295 </el-input> 268 </el-input>
296 </el-form-item> 269 </el-form-item>
297 </el-col> 270 </el-col>
298 </el-row> 271 </el-row>
  272 + <el-divider content-position="center"> 商品管理其他非必填信息 </el-divider>
  273 + <el-divider content-position="left"> 商品基础信息 </el-divider>
299 <el-row> 274 <el-row>
300 <el-col :span="6"> 275 <el-col :span="6">
301 - <el-form-item label="" :label-width="formLabelWidth" prop="createdat">  
302 - <el-input v-model="addForm.createdat" autocomplete="off" >  
303 - <template slot="prepend">创建日期</template> 276 + <el-form-item label="" :label-width="formLabelWidth" prop="stuff">
  277 + <el-input v-model="addForm.stuff" autocomplete="off" size="small">
  278 + <template slot="prepend">成&emsp;&emsp;份</template>
304 </el-input> 279 </el-input>
305 </el-form-item> 280 </el-form-item>
306 </el-col> 281 </el-col>
307 <el-col :span="6"> 282 <el-col :span="6">
308 - <el-form-item label="" :label-width="formLabelWidth" prop="cofno">  
309 - <el-input v-model="addForm.cofno" autocomplete="off" >  
310 - <template slot="prepend">原产地证书</template> 283 + <el-form-item label="" :label-width="formLabelWidth" prop="grosswt">
  284 + <el-input v-model="addForm.grosswt" autocomplete="off" size="small">
  285 + <template slot="prepend">毛&emsp;&emsp;重</template>
311 </el-input> 286 </el-input>
312 </el-form-item> 287 </el-form-item>
313 </el-col> 288 </el-col>
314 <el-col :span="6"> 289 <el-col :span="6">
315 - <el-form-item label="" :label-width="formLabelWidth" prop="costprice">  
316 - <el-input v-model="addForm.costprice" autocomplete="off" >  
317 - <template slot="prepend">采&emsp;购&emsp;价</template> 290 + <el-form-item label="" :label-width="formLabelWidth" prop="stocknum">
  291 + <el-input v-model="addForm.stocknum" autocomplete="off" size="small">
  292 + <template slot="prepend">库存数量</template>
318 </el-input> 293 </el-input>
319 </el-form-item> 294 </el-form-item>
320 </el-col> 295 </el-col>
321 <el-col :span="6"> 296 <el-col :span="6">
322 - <el-form-item label="" :label-width="formLabelWidth" prop="createdby">  
323 - <el-input v-model="addForm.createdby" autocomplete="off" >  
324 - <template slot="prepend">创&emsp;建&emsp;人</template> 297 + <el-form-item label="" :label-width="formLabelWidth" prop="picture">
  298 + <el-input v-model="addForm.picture" autocomplete="off" size="small">
  299 + <template slot="prepend">图&emsp;&emsp;片</template>
325 </el-input> 300 </el-input>
326 </el-form-item> 301 </el-form-item>
327 </el-col> 302 </el-col>
328 </el-row> 303 </el-row>
329 <el-row> 304 <el-row>
330 <el-col :span="6"> 305 <el-col :span="6">
331 - <el-form-item label="" :label-width="formLabelWidth" prop="dangmark">  
332 - <div class="my-text-area">  
333 - <div class="el-input-group__prepend prepand">危险品标志</div>  
334 - <el-select v-model="addForm.dangmark" placeholder="请选择是否虚拟仓库" style="width: 150px">  
335 - <el-option label="否" value="0"></el-option>  
336 - <el-option label="是" value="1"></el-option>  
337 - </el-select>  
338 - </div> 306 + <el-form-item label="" :label-width="formLabelWidth" prop="gdsbrand">
  307 + <el-input v-model="addForm.gdsbrand" autocomplete="off" size="small">
  308 + <template slot="prepend">商品品牌</template>
  309 + </el-input>
339 </el-form-item> 310 </el-form-item>
340 </el-col> 311 </el-col>
341 <el-col :span="6"> 312 <el-col :span="6">
342 - <el-form-item label="" :label-width="formLabelWidth" prop="dangpackspec">  
343 - <el-input v-model="addForm.dangpackspec" autocomplete="off" >  
344 - <template slot="prepend">危险品规格</template> 313 + <el-form-item label="" :label-width="formLabelWidth" prop="gdsspcfmodeldesc">
  314 + <el-input v-model="addForm.gdsspcfmodeldesc" autocomplete="off" size="small">
  315 + <template slot="prepend">型号规格</template>
345 </el-input> 316 </el-input>
346 </el-form-item> 317 </el-form-item>
347 </el-col> 318 </el-col>
348 <el-col :span="6"> 319 <el-col :span="6">
349 - <el-form-item label="" :label-width="formLabelWidth" prop="dangpacktype">  
350 - <el-input v-model="addForm.dangpacktype" autocomplete="off" >  
351 - <template slot="prepend">危险品类别</template> 320 + <el-form-item label="" :label-width="formLabelWidth" prop="gdsupplier">
  321 + <el-input v-model="addForm.gdsupplier" autocomplete="off" size="small">
  322 + <template slot="prepend">商品供应商</template>
352 </el-input> 323 </el-input>
353 </el-form-item> 324 </el-form-item>
354 </el-col> 325 </el-col>
355 <el-col :span="6"> 326 <el-col :span="6">
356 - <el-form-item label="" :label-width="formLabelWidth" prop="dangunno">  
357 - <el-input v-model="addForm.dangunno" autocomplete="off" >  
358 - <template slot="prepend">联合国编号</template> 327 + <el-form-item label="" :label-width="formLabelWidth" prop="goodsattr">
  328 + <el-input v-model="addForm.goodsattr" autocomplete="off" size="small">
  329 + <template slot="prepend">货物属性代码</template>
359 </el-input> 330 </el-input>
360 </el-form-item> 331 </el-form-item>
361 </el-col> 332 </el-col>
362 </el-row> 333 </el-row>
363 <el-row> 334 <el-row>
364 <el-col :span="6"> 335 <el-col :span="6">
365 - <el-form-item label="" :label-width="formLabelWidth" prop="dclunitcd">  
366 - <el-input v-model="addForm.dclunitcd" autocomplete="off" >  
367 - <template slot="prepend">单&emsp;&emsp;位</template>  
368 - </el-input>  
369 - </el-form-item>  
370 - </el-col>  
371 - <el-col :span="6">  
372 - <el-form-item label="" :label-width="formLabelWidth" prop="dcluprcamt">  
373 - <el-input v-model="addForm.dcluprcamt" autocomplete="off" >  
374 - <template slot="prepend">单&emsp;&emsp;价</template> 336 + <el-form-item label="" :label-width="formLabelWidth" prop="gdsmaster">
  337 + <el-input v-model="addForm.gdsmaster" autocomplete="off" size="small">
  338 + <template slot="prepend">货&emsp;&emsp;主</template>
375 </el-input> 339 </el-input>
376 </el-form-item> 340 </el-form-item>
377 </el-col> 341 </el-col>
378 <el-col :span="6"> 342 <el-col :span="6">
379 - <el-form-item label="" :label-width="formLabelWidth" prop="dclurrcd">  
380 - <el-input v-model="addForm.dclurrcd" autocomplete="off" >  
381 - <template slot="prepend">单价单位</template> 343 + <el-form-item label="" :label-width="formLabelWidth" prop="status">
  344 + <el-input v-model="addForm.status" autocomplete="off" size="small" disabled>
  345 + <template slot="prepend">状&emsp;&emsp;态</template>
382 </el-input> 346 </el-input>
383 </el-form-item> 347 </el-form-item>
384 </el-col> 348 </el-col>
385 <el-col :span="6"> 349 <el-col :span="6">
386 - <el-form-item label="" :label-width="formLabelWidth" prop="declgoodsename">  
387 - <el-input v-model="addForm.declgoodsename" autocomplete="off" >  
388 - <template slot="prepend">商品英文名称</template> 350 + <el-form-item label="" :label-width="formLabelWidth" prop="costprice">
  351 + <el-input v-model="addForm.costprice" autocomplete="off" size="small">
  352 + <template slot="prepend">采&emsp;购&emsp;价</template>
389 </el-input> 353 </el-input>
390 </el-form-item> 354 </el-form-item>
391 </el-col> 355 </el-col>
392 - </el-row>  
393 - <el-row>  
394 <el-col :span="6"> 356 <el-col :span="6">
395 <el-form-item label="" :label-width="formLabelWidth" prop="fitprcpromise"> 357 <el-form-item label="" :label-width="formLabelWidth" prop="fitprcpromise">
396 <div class="my-text-area"> 358 <div class="my-text-area">
397 <div class="el-input-group__prepend prepand">价格承诺</div> 359 <div class="el-input-group__prepend prepand">价格承诺</div>
398 - <el-select v-model="addForm.fitprcpromise" placeholder="是否符合价格承诺" style="width: 150px">  
399 - <el-option label="否" value="0"></el-option>  
400 - <el-option label="是" value="1"></el-option> 360 + <el-select v-model="addForm.fitprcpromise" placeholder="是否符合价格承诺" size="small" style="width: 150px">
  361 + <el-option label="否" value='0'></el-option>
  362 + <el-option label="是" value='1'></el-option>
401 </el-select> 363 </el-select>
402 </div> 364 </div>
403 </el-form-item> 365 </el-form-item>
404 </el-col> 366 </el-col>
405 - <el-col :span="6">  
406 - <el-form-item label="" :label-width="formLabelWidth" prop="destinationnatcd">  
407 - <el-input v-model="addForm.destinationnatcd" autocomplete="off" >  
408 - <template slot="prepend">最终目的国</template>  
409 - </el-input>  
410 - </el-form-item>  
411 - </el-col>  
412 - <el-col :span="6">  
413 - <el-form-item label="" :label-width="formLabelWidth" prop="domintcir">  
414 - <el-input v-model="addForm.domintcir" autocomplete="off" >  
415 - <template slot="prepend">国内国际流转</template>  
416 - </el-input>  
417 - </el-form-item>  
418 - </el-col>  
419 - <el-col :span="6">  
420 - <el-form-item label="" :label-width="formLabelWidth" prop="esdutyrate">  
421 - <el-input v-model="addForm.esdutyrate" autocomplete="off" >  
422 - <template slot="prepend">保障措施税率</template>  
423 - </el-input>  
424 - </el-form-item>  
425 - </el-col> 367 +
  368 +
426 </el-row> 369 </el-row>
427 <el-row> 370 <el-row>
428 - <el-col :span="6">  
429 - <el-form-item label="" :label-width="formLabelWidth" prop="gdsspcfmodeldesc">  
430 - <el-input v-model="addForm.gdsspcfmodeldesc" autocomplete="off" >  
431 - <template slot="prepend">型号规格</template>  
432 - </el-input>  
433 - </el-form-item>  
434 - </el-col>  
435 - <el-col :span="6">  
436 - <el-form-item label="" :label-width="formLabelWidth" prop="grosswt">  
437 - <el-input v-model="addForm.grosswt" autocomplete="off" >  
438 - <template slot="prepend">毛&emsp;&emsp;重</template>  
439 - </el-input>  
440 - </el-form-item>  
441 - </el-col>  
442 - <el-col :span="6">  
443 - <el-form-item label="" :label-width="formLabelWidth" prop="gdsupplier">  
444 - <el-input v-model="addForm.gdsupplier" autocomplete="off" >  
445 - <template slot="prepend">商品供应商</template>  
446 - </el-input>  
447 - </el-form-item>  
448 - </el-col>  
449 - <el-col :span="6">  
450 - <el-form-item label="" :label-width="formLabelWidth" prop="goodsattr">  
451 - <el-input v-model="addForm.goodsattr" autocomplete="off" >  
452 - <template slot="prepend">货物属性代码</template>  
453 - </el-input>  
454 - </el-form-item>  
455 - </el-col>  
456 - </el-row> 371 + <el-divider content-position="left"> 商品生产信息 </el-divider>
  372 + <el-row>
  373 +
  374 + <el-col :span="6">
  375 + <el-form-item label="" :label-width="formLabelWidth" prop="producer">
  376 + <el-input v-model="addForm.producer" autocomplete="off" size="small">
  377 + <template slot="prepend">生产商&emsp;</template>
  378 + </el-input>
  379 + </el-form-item>
  380 + </el-col>
  381 + <el-col :span="6">
  382 + <el-form-item label="" :label-width="formLabelWidth" prop="prodbatchno">
  383 + <el-input v-model="addForm.prodbatchno" autocomplete="off" size="small">
  384 + <template slot="prepend">生产批号</template>
  385 + </el-input>
  386 + </el-form-item>
  387 + </el-col>
  388 + <el-col :span="6">
  389 + <el-form-item label="" :label-width="formLabelWidth" prop="mnufctrregname">
  390 + <el-input v-model="addForm.mnufctrregname" autocomplete="off" size="small">
  391 + <template slot="prepend">生产单位名称</template>
  392 + </el-input>
  393 + </el-form-item>
  394 + </el-col>
  395 + <el-col :span="6">
  396 + <el-form-item label="" :label-width="formLabelWidth" prop="mnufctrregno">
  397 + <el-input v-model="addForm.mnufctrregno" autocomplete="off" size="small">
  398 + <template slot="prepend">生产单位注册号</template>
  399 + </el-input>
  400 + </el-form-item>
  401 + </el-col>
  402 + </el-row>
  403 + <el-row>
  404 + <el-col :span="6">
  405 + <el-form-item label="" :label-width="formLabelWidth" prop="producedate">
  406 + <el-input v-model="addForm.producedate" autocomplete="off" size="small">
  407 + <template slot="prepend">生产日期</template>
  408 + </el-input>
  409 + </el-form-item>
  410 + </el-col>
  411 + <el-col :span="6">
  412 + <el-form-item label="" :label-width="formLabelWidth" prop="prodqgp">
  413 + <el-input v-model="addForm.prodqgp" autocomplete="off" size="small">
  414 + <template slot="prepend">产品保质期</template>
  415 + </el-input>
  416 + </el-form-item>
  417 + </el-col>
  418 + <el-col :span="6">
  419 + <el-form-item label="" :label-width="formLabelWidth" prop="prodvaliddt">
  420 + <el-input v-model="addForm.prodvaliddt" autocomplete="off" size="small">
  421 + <template slot="prepend">产品有效期</template>
  422 + </el-input>
  423 + </el-form-item>
  424 + </el-col>
  425 + <el-col :span="6">
  426 + <el-form-item label="" :label-width="formLabelWidth" prop="declgoodsename">
  427 + <el-input v-model="addForm.declgoodsename" autocomplete="off" size="small">
  428 + <template slot="prepend">商品英文名称</template>
  429 + </el-input>
  430 + </el-form-item>
  431 + </el-col>
  432 + </el-row>
  433 + <el-row>
  434 + <el-col :span="6">
  435 + <el-form-item label="" :label-width="formLabelWidth" prop="natcd">
  436 + <el-input v-model="addForm.natcd" autocomplete="off" size="small">
  437 + <template slot="prepend">原产国&emsp;</template>
  438 + </el-input>
  439 + </el-form-item>
  440 + </el-col>
  441 + <el-col :span="6">
  442 + <el-form-item label="" :label-width="formLabelWidth" prop="cofno">
  443 + <el-input v-model="addForm.cofno" autocomplete="off" size="small">
  444 + <template slot="prepend">原产地证书</template>
  445 + </el-input>
  446 + </el-form-item>
  447 + </el-col>
  448 + <el-col :span="6">
  449 + <el-form-item label="" :label-width="formLabelWidth" prop="destinationnatcd">
  450 + <el-input v-model="addForm.destinationnatcd" autocomplete="off" size="small">
  451 + <template slot="prepend">最终目的国</template>
  452 + </el-input>
  453 + </el-form-item>
  454 + </el-col>
  455 + <el-col :span="6">
  456 + <el-form-item label="" :label-width="formLabelWidth" prop="putrecseqno">
  457 + <el-input v-model="addForm.putrecseqno" autocomplete="off" size="small">
  458 + <template slot="prepend">备案序号</template>
  459 + </el-input>
  460 + </el-form-item>
  461 + </el-col>
  462 + </el-row>
  463 + <el-row>
  464 + <el-col :span="6">
  465 + <el-form-item label="" :label-width="formLabelWidth" prop="ofcnname">
  466 + <el-input v-model="addForm.ofcnname" autocomplete="off" size="small">
  467 + <template slot="prepend">原厂商中文名称</template>
  468 + </el-input>
  469 + </el-form-item>
  470 + </el-col>
  471 + <el-col :span="6">
  472 + <el-form-item label="" :label-width="formLabelWidth" prop="ofenname">
  473 + <el-input v-model="addForm.ofenname" autocomplete="off" size="small">
  474 + <template slot="prepend">原厂商英文名称</template>
  475 + </el-input>
  476 + </el-form-item>
  477 + </el-col>
  478 + </el-row>
  479 + <el-divider content-position="left"> 商品危险品信息 </el-divider>
457 <el-row> 480 <el-row>
458 <el-col :span="6"> 481 <el-col :span="6">
459 - <el-form-item label="" :label-width="formLabelWidth" prop="itemno">  
460 - <el-input v-model="addForm.itemno" autocomplete="off" >  
461 - <template slot="prepend">项&emsp;&emsp;号</template>  
462 - </el-input>  
463 - </el-form-item>  
464 - </el-col>  
465 - <el-col :span="6">  
466 - <el-form-item label="" :label-width="formLabelWidth" prop="destinationnatcd">  
467 - <el-input v-model="addForm.destinationnatcd" autocomplete="off" >  
468 - <template slot="prepend">最终目的国</template> 482 + <el-form-item label="" :label-width="formLabelWidth" prop="dangpackspec">
  483 + <el-input v-model="addForm.dangpackspec" autocomplete="off" size="small">
  484 + <template slot="prepend">危险品规格</template>
469 </el-input> 485 </el-input>
470 </el-form-item> 486 </el-form-item>
471 </el-col> 487 </el-col>
472 <el-col :span="6"> 488 <el-col :span="6">
473 - <el-form-item label="" :label-width="formLabelWidth" prop="mnufctrregname">  
474 - <el-input v-model="addForm.mnufctrregname" autocomplete="off" >  
475 - <template slot="prepend">生产单位名称</template> 489 + <el-form-item label="" :label-width="formLabelWidth" prop="dangpacktype">
  490 + <el-input v-model="addForm.dangpacktype" autocomplete="off" size="small">
  491 + <template slot="prepend">危险品类别</template>
476 </el-input> 492 </el-input>
477 </el-form-item> 493 </el-form-item>
478 </el-col> 494 </el-col>
479 <el-col :span="6"> 495 <el-col :span="6">
480 - <el-form-item label="" :label-width="formLabelWidth" prop="mnufctrregno">  
481 - <el-input v-model="addForm.mnufctrregno" autocomplete="off" >  
482 - <template slot="prepend">生产单位注册号</template>  
483 - </el-input> 496 + <el-form-item label="" :label-width="formLabelWidth" prop="dangmark">
  497 + <div class="my-text-area">
  498 + <div class="el-input-group__prepend prepand">危险品标志</div>
  499 + <el-select v-model="addForm.dangmark" placeholder="请选择是否虚拟仓库" size="small" style="width: 150px">
  500 + <el-option label="否" value='0'></el-option>
  501 + <el-option label="是" value='1'></el-option>
  502 + </el-select>
  503 + </div>
484 </el-form-item> 504 </el-form-item>
485 </el-col> 505 </el-col>
486 </el-row> 506 </el-row>
  507 + <el-divider content-position="left"> 商品扩展信息 </el-divider>
487 <el-row> 508 <el-row>
488 <el-col :span="6"> 509 <el-col :span="6">
489 - <el-form-item label="" :label-width="formLabelWidth" prop="natcd">  
490 - <el-input v-model="addForm.natcd" autocomplete="off" >  
491 - <template slot="prepend">原&emsp;产&emsp;国</template> 510 + <el-form-item label="" :label-width="formLabelWidth" prop="seqno">
  511 + <el-input v-model="addForm.seqno" autocomplete="off" size="small">
  512 + <template slot="prepend">统一编号</template>
492 </el-input> 513 </el-input>
493 </el-form-item> 514 </el-form-item>
494 </el-col> 515 </el-col>
495 <el-col :span="6"> 516 <el-col :span="6">
496 - <el-form-item label="" :label-width="formLabelWidth" prop="newwt">  
497 - <el-input v-model="addForm.newwt" autocomplete="off" >  
498 - <template slot="prepend">净&emsp;&emsp;重</template> 517 + <el-form-item label="" :label-width="formLabelWidth" prop="uncode">
  518 + <el-input v-model="addForm.uncode" autocomplete="off" size="small">
  519 + <template slot="prepend">UN编码</template>
499 </el-input> 520 </el-input>
500 </el-form-item> 521 </el-form-item>
501 </el-col> 522 </el-col>
502 <el-col :span="6"> 523 <el-col :span="6">
503 - <el-form-item label="" :label-width="formLabelWidth" prop="ofcnname">  
504 - <el-input v-model="addForm.ofcnname" autocomplete="off" >  
505 - <template slot="prepend">原厂商中文名称</template> 524 + <el-form-item label="" :label-width="formLabelWidth" prop="dangunno">
  525 + <el-input v-model="addForm.dangunno" autocomplete="off" size="small">
  526 + <template slot="prepend">联合国编号</template>
506 </el-input> 527 </el-input>
507 </el-form-item> 528 </el-form-item>
508 </el-col> 529 </el-col>
509 <el-col :span="6"> 530 <el-col :span="6">
510 - <el-form-item label="" :label-width="formLabelWidth" prop="ofenname">  
511 - <el-input v-model="addForm.ofenname" autocomplete="off" >  
512 - <template slot="prepend">原厂商英文名称</template> 531 + <el-form-item label="" :label-width="formLabelWidth" prop="ptacode">
  532 + <el-input v-model="addForm.ptacode" autocomplete="off" size="small">
  533 + <template slot="prepend">优惠贸易协定代码</template>
513 </el-input> 534 </el-input>
514 </el-form-item> 535 </el-form-item>
515 </el-col> 536 </el-col>
516 </el-row> 537 </el-row>
517 <el-row> 538 <el-row>
518 <el-col :span="6"> 539 <el-col :span="6">
519 - <el-form-item label="" :label-width="formLabelWidth" prop="picture">  
520 - <el-input v-model="addForm.picture" autocomplete="off" >  
521 - <template slot="prepend">图&emsp;&emsp;片</template>  
522 - </el-input>  
523 - </el-form-item>  
524 - </el-col>  
525 - <el-col :span="6">  
526 - <el-form-item label="" :label-width="formLabelWidth" prop="prodbatchno">  
527 - <el-input v-model="addForm.prodbatchno" autocomplete="off" >  
528 - <template slot="prepend">生产批号</template> 540 + <el-form-item label="" :label-width="formLabelWidth" prop="domintcir">
  541 + <el-input v-model="addForm.domintcir" autocomplete="off" size="small">
  542 + <template slot="prepend">国内国际流转</template>
529 </el-input> 543 </el-input>
530 </el-form-item> 544 </el-form-item>
531 </el-col> 545 </el-col>
532 <el-col :span="6"> 546 <el-col :span="6">
533 - <el-form-item label="" :label-width="formLabelWidth" prop="prodqgp">  
534 - <el-input v-model="addForm.prodqgp" autocomplete="off" >  
535 - <template slot="prepend">产品保质期</template> 547 + <el-form-item label="" :label-width="formLabelWidth" prop="esdutyrate">
  548 + <el-input v-model="addForm.esdutyrate" autocomplete="off" size="small">
  549 + <template slot="prepend">保障措施税率</template>
536 </el-input> 550 </el-input>
537 </el-form-item> 551 </el-form-item>
538 </el-col> 552 </el-col>
539 <el-col :span="6"> 553 <el-col :span="6">
540 - <el-form-item label="" :label-width="formLabelWidth" prop="mnufctrregname">  
541 - <el-input v-model="addForm.mnufctrregname" autocomplete="off" >  
542 - <template slot="prepend">生产单位名称</template> 554 + <el-form-item label="" :label-width="formLabelWidth" prop="usafeermvmapk">
  555 + <el-input v-model="addForm.usafeermvmapk" autocomplete="off" size="small">
  556 + <template slot="prepend">对美加征排除标志</template>
543 </el-input> 557 </el-input>
544 </el-form-item> 558 </el-form-item>
545 </el-col> 559 </el-col>
546 </el-row> 560 </el-row>
  561 + <el-divider content-position="left"> 商品其他信息 </el-divider>
547 <el-row> 562 <el-row>
548 <el-col :span="6"> 563 <el-col :span="6">
549 - <el-form-item label="" :label-width="formLabelWidth" prop="producedate">  
550 - <el-input v-model="addForm.producedate" autocomplete="off" >  
551 - <template slot="prepend">生产日期</template> 564 + <el-form-item label="" :label-width="formLabelWidth" prop="createdby">
  565 + <el-input v-model="addForm.createdby" autocomplete="off" size="small" disabled>
  566 + <template slot="prepend">创建人&emsp;</template>
552 </el-input> 567 </el-input>
553 </el-form-item> 568 </el-form-item>
554 </el-col> 569 </el-col>
555 <el-col :span="6"> 570 <el-col :span="6">
556 - <el-form-item label="" :label-width="formLabelWidth" prop="producer">  
557 - <el-input v-model="addForm.producer" autocomplete="off" >  
558 - <template slot="prepend">生&emsp;产&emsp;商</template> 571 + <el-form-item label="" :label-width="formLabelWidth" prop="createdat">
  572 + <el-input v-model="addForm.createdat" autocomplete="off" size="small" disabled>
  573 + <template slot="prepend">创建日期</template>
559 </el-input> 574 </el-input>
560 </el-form-item> 575 </el-form-item>
561 </el-col> 576 </el-col>
562 <el-col :span="6"> 577 <el-col :span="6">
563 - <el-form-item label="" :label-width="formLabelWidth" prop="prodvaliddt">  
564 - <el-input v-model="addForm.prodvaliddt" autocomplete="off" >  
565 - <template slot="prepend">产品有效期</template> 578 + <el-form-item label="" :label-width="formLabelWidth" prop="updatedby">
  579 + <el-input v-model="addForm.updatedby" autocomplete="off" size="small" disabled>
  580 + <template slot="prepend">更新人&emsp;</template>
566 </el-input> 581 </el-input>
567 </el-form-item> 582 </el-form-item>
568 </el-col> 583 </el-col>
569 <el-col :span="6"> 584 <el-col :span="6">
570 - <el-form-item label="" :label-width="formLabelWidth" prop="ptacode">  
571 - <el-input v-model="addForm.ptacode" autocomplete="off" >  
572 - <template slot="prepend">优惠贸易协定代码</template> 585 + <el-form-item label="" :label-width="formLabelWidth" prop="updatedat">
  586 + <el-input v-model="addForm.updatedat" autocomplete="off" size="small" disabled>
  587 + <template slot="prepend">更新日期</template>
573 </el-input> 588 </el-input>
574 </el-form-item> 589 </el-form-item>
575 </el-col> 590 </el-col>
576 </el-row> 591 </el-row>
577 - <el-row>  
578 - <el-col :span="6">  
579 - <el-form-item label="" :label-width="formLabelWidth" prop="seqno">  
580 - <el-input v-model="addForm.seqno" autocomplete="off" >  
581 - <template slot="prepend">统一编号</template>  
582 - </el-input>  
583 - </el-form-item>  
584 - </el-col>  
585 - <el-col :span="6">  
586 - <el-form-item label="" :label-width="formLabelWidth" prop="usafeermvmapk">  
587 - <el-input v-model="addForm.usafeermvmapk" autocomplete="off" >  
588 - <template slot="prepend">对美加征排除标志</template>  
589 - </el-input>  
590 - </el-form-item>  
591 - </el-col>  
592 - <el-col :span="6">  
593 - <el-form-item label="" :label-width="formLabelWidth" prop="rmk">  
594 - <el-input v-model="addForm.rmk" autocomplete="off" >  
595 - <template slot="prepend">备&emsp;&emsp;注</template>  
596 - </el-input>  
597 - </el-form-item>  
598 - </el-col> 592 + <el-row>
  593 + <el-col :span="6">
  594 + <el-form-item label="" :label-width="formLabelWidth" prop="rmk">
  595 + <el-input v-model="addForm.rmk" autocomplete="off" size="small">
  596 + <template slot="prepend">备&emsp;&emsp;注</template>
  597 + </el-input>
  598 + </el-form-item>
  599 + </el-col>
  600 + </el-row>
599 </el-row> 601 </el-row>
600 </el-form> 602 </el-form>
601 <div slot="footer" class="dialog-footer"> 603 <div slot="footer" class="dialog-footer">
602 - <el-button @click="apply_dialog.addDialog = false" >取 消</el-button>  
603 - <el-button type="primary" @click="dialogApply==='create'?add():edit()" >提 交</el-button> 604 + <el-button @click="apply_dialog.addDialog = false" size="small">取 消</el-button>
  605 + <el-button type="primary" @click="dialogApply==='create'?add():edit()" size="small">提 交</el-button>
604 </div> 606 </div>
605 </el-dialog> 607 </el-dialog>
606 </el-row> 608 </el-row>
@@ -650,7 +652,7 @@ @@ -650,7 +652,7 @@
650 costprice: '', 652 costprice: '',
651 createdat: '', 653 createdat: '',
652 createdby: '', 654 createdby: '',
653 - dangmark: '', 655 + dangmark: '0',
654 dangpackspec: '', 656 dangpackspec: '',
655 dangpacktype: '', 657 dangpacktype: '',
656 dangunno: '', 658 dangunno: '',
@@ -661,7 +663,7 @@ @@ -661,7 +663,7 @@
661 destinationnatcd: '', 663 destinationnatcd: '',
662 domintcir: '', 664 domintcir: '',
663 esdutyrate: '', 665 esdutyrate: '',
664 - fitprcpromise: '', 666 + fitprcpromise: '0',
665 gdebc: '', 667 gdebc: '',
666 gdecd: '', 668 gdecd: '',
667 gdetype: '', 669 gdetype: '',
@@ -704,7 +706,53 @@ @@ -704,7 +706,53 @@
704 formLabelWidth: '20px', 706 formLabelWidth: '20px',
705 dialogVisible:false, 707 dialogVisible:false,
706 rules: { 708 rules: {
  709 + gdsnm: [
  710 + { required: true, message: '该项为必填项', trigger: 'blur' }
  711 + ],
  712 + gdetype: [
  713 + { required: true, message: '该项为必填项', trigger: 'blur' }
  714 + ],
  715 + gdebc: [
  716 + { required: true, message: '该项为必填项', trigger: 'blur' }
  717 + ],
  718 + gdecd: [
  719 + { required: true, message: '该项为必填项', trigger: 'blur' }
  720 + ],
  721 + itemno: [
  722 + { required: true, message: '该项为必填项', trigger: 'blur' }
  723 + ],
  724 + gdsmtno: [
  725 + { required: true, message: '该项为必填项', trigger: 'blur' }
  726 + ],
  727 + skucd: [
  728 + { required: true, message: '该项为必填项', trigger: 'blur' }
  729 + ],
  730 + bondedtype: [
  731 + { required: true, message: '该项为必填项', trigger: 'blur' }
  732 + ],
  733 + newwt: [
  734 + { required: true, message: '该项为必填项', trigger: 'blur' }
  735 + ],
  736 + dclunitcd: [
  737 + { required: true, message: '该项为必填项', trigger: 'blur' }
  738 + ],
  739 + dcluprcamt: [
  740 + { required: true, message: '该项为必填项', trigger: 'blur' }
  741 + ],
  742 + dclurrcd: [
  743 + { required: true, message: '该项为必填项', trigger: 'blur' }
  744 + ],
  745 + cofgdsno: [
  746 + { required: true, message: '该项为必填项', trigger: 'blur' }
  747 + ],
  748 + asdutyrate: [
  749 + { required: true, message: '该项为必填项', trigger: 'blur' }
  750 + ],
  751 + atdutyrate: [
  752 + { required: true, message: '该项为必填项', trigger: 'blur' }
  753 + ],
707 }, 754 },
  755 +
708 } 756 }
709 }, 757 },
710 methods: { 758 methods: {
@@ -745,7 +793,7 @@ @@ -745,7 +793,7 @@
745 costprice: '', 793 costprice: '',
746 createdat: '', 794 createdat: '',
747 createdby: '', 795 createdby: '',
748 - dangmark: '', 796 + dangmark: '0',
749 dangpackspec: '', 797 dangpackspec: '',
750 dangpacktype: '', 798 dangpacktype: '',
751 dangunno: '', 799 dangunno: '',
@@ -756,7 +804,7 @@ @@ -756,7 +804,7 @@
756 destinationnatcd: '', 804 destinationnatcd: '',
757 domintcir: '', 805 domintcir: '',
758 esdutyrate: '', 806 esdutyrate: '',
759 - fitprcpromise: '', 807 + fitprcpromise: '0',
760 gdebc: '', 808 gdebc: '',
761 gdecd: '', 809 gdecd: '',
762 gdetype: '', 810 gdetype: '',
@@ -174,7 +174,7 @@ @@ -174,7 +174,7 @@
174 </el-pagination> 174 </el-pagination>
175 </el-row> 175 </el-row>
176 <el-row> 176 <el-row>
177 - <el-dialog :title="dialogMap[dialogApply]" :visible.sync="apply_dialog" width="90%" > 177 + <el-dialog :title="dialogMap[dialogApply]" :visible.sync="apply_dialog" width="90%" v-dialog-drag>
178 <!-- 搜索区域--> 178 <!-- 搜索区域-->
179 <el-row :gutter="10" class="toolbar" style="height: auto;padding-bottom: 15px"> 179 <el-row :gutter="10" class="toolbar" style="height: auto;padding-bottom: 15px">
180 <el-divider content-position="left"> 分类监管表头主要信息 </el-divider> 180 <el-divider content-position="left"> 分类监管表头主要信息 </el-divider>