Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
feiyue.teng
4616138e 1 parent a355dd98

客户管理修改页面字段添加

Inline Side-by-side
Showing 3 changed files with 66 additions and 19 deletions
...@@ -265,7 +265,33 @@ ...@@ -265,7 +265,33 @@
265 <section class="dlTitle"> 265 <section class="dlTitle">
266 <h3>密码机管理</h3> 266 <h3>密码机管理</h3>
267 </section> 267 </section>
268 - <el-row> 268 + <el-row :gutter="5">
269 + <el-col :span="8">
270 + <Formitem label="证书序列号" prop="certificateSerialNumber" type="edit">
271 + <el-input
272 + type="text"
273 + class="inputShadow"
274 + id="inputInner-edit-certificateSerialNumber"
275 + resize="none"
276 + v-model="formData.certificateSerialNumber"
277 + clearable
278 + placeholder=""
279 + ></el-input>
280 + </Formitem>
281 + </el-col>
282 + <el-col :span="8">
283 + <Formitem label="证书索引号" prop="certificateIndexNumber" type="edit">
284 + <el-input
285 + type="text"
286 + class="inputShadow"
287 + id="inputInner-edit-certificateIndexNumber"
288 + resize="none"
289 + v-model="formData.certificateIndexNumber"
290 + clearable
291 + placeholder=""
292 + ></el-input>
293 + </Formitem>
294 + </el-col>
269 <el-col :span="16" style="padding-right: 5px;"> 295 <el-col :span="16" style="padding-right: 5px;">
270 <div class="uploadItem"> 296 <div class="uploadItem">
271 <div class="uploadbox"> 297 <div class="uploadbox">
...@@ -321,19 +347,7 @@ ...@@ -321,19 +347,7 @@
321 </div> 347 </div>
322 </div> 348 </div>
323 </el-col> 349 </el-col>
324 - <el-col :span="8"> 350 +
325 - <Formitem label="证书序列号" prop="certificateSerialNumber" type="edit">
326 - <el-input
327 - type="text"
328 - class="inputShadow"
329 - id="inputInner-edit-certificateSerialNumber"
330 - resize="none"
331 - v-model="formData.certificateSerialNumber"
332 - clearable
333 - placeholder=""
334 - ></el-input>
335 - </Formitem>
336 - </el-col>
337 </el-row> 351 </el-row>
338 </div> 352 </div>
339 </el-form> 353 </el-form>
...@@ -402,6 +416,7 @@ export default { ...@@ -402,6 +416,7 @@ export default {
402 ecomEntName: "", 416 ecomEntName: "",
403 orderRequester: "", 417 orderRequester: "",
404 certificateSerialNumber: "", 418 certificateSerialNumber: "",
419 + certificateIndexNumber: "",
405 qingdaoKey: "", 420 qingdaoKey: "",
406 qingdaoUserDxpid: "", 421 qingdaoUserDxpid: "",
407 qingdaoDanyiUserDxpid:"", 422 qingdaoDanyiUserDxpid:"",
...@@ -784,6 +799,7 @@ export default { ...@@ -784,6 +799,7 @@ export default {
784 ecomEntName: "", 799 ecomEntName: "",
785 orderRequester: "", 800 orderRequester: "",
786 certificateSerialNumber: "", 801 certificateSerialNumber: "",
802 + certificateIndexNumber: "",
787 qingdaoKey: "", 803 qingdaoKey: "",
788 qingdaoUserDxpid: "", 804 qingdaoUserDxpid: "",
789 qingdaoDanyiUserDxpid:"", 805 qingdaoDanyiUserDxpid:"",
......
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
129 v-for="(item, index) in $store.getters.dict.COUNTRY_REGION_CODE" 129 v-for="(item, index) in $store.getters.dict.COUNTRY_REGION_CODE"
130 :key="index" 130 :key="index"
131 :label="item.itemChineseName" 131 :label="item.itemChineseName"
132 - :value="item.itemValue" 132 + :value="item.itemCode"
133 ></el-option> 133 ></el-option>
134 </el-select> 134 </el-select>
135 </Formitem> 135 </Formitem>
...@@ -351,9 +351,6 @@ ...@@ -351,9 +351,6 @@
351 } 351 }
352 }; 352 };
353 }, 353 },
354 - watch: {
355 -
356 - },
357 methods: { 354 methods: {
358 rowFormDataSave(){ 355 rowFormDataSave(){
359 this.$refs.editRowForm.validate((valid) => { 356 this.$refs.editRowForm.validate((valid) => {
......
...@@ -462,7 +462,7 @@ ...@@ -462,7 +462,7 @@
462 <el-col :span="6"> 462 <el-col :span="6">
463 <Formitem label="备注" prop="remark"> 463 <Formitem label="备注" prop="remark">
464 <el-input 464 <el-input
465 - type="textarea" 465 + type="text"
466 class="inputShadow" 466 class="inputShadow"
467 id="inputInner--remark" 467 id="inputInner--remark"
468 resize="none" 468 resize="none"
...@@ -502,6 +502,15 @@ ...@@ -502,6 +502,15 @@
502 @rowFormDataSave="rowFormDataSave" 502 @rowFormDataSave="rowFormDataSave"
503 /> 503 />
504 </template> 504 </template>
505 + <template v-slot:destinationCountryRegionCode="scope">
506 + <span>{{ mapDicDatas($store.getters.dict.COUNTRY_REGION_CODE, scope.row.destinationCountryRegionCode) }}</span>
507 + </template>
508 + <template v-slot:unit="scope">
509 + <span>{{ mapDicDatas($store.getters.dict.MEASUREMENT_UNIT, scope.row.unit) }}</span>
510 + </template>
511 + <template v-slot:currency="scope">
512 + <span>{{ mapCurrencyDatas($store.getters.dict.CURRENCY, scope.row.currency) }}</span>
513 + </template>
505 <template slot="optionColumn"> 514 <template slot="optionColumn">
506 <el-table-column align="left" label="操作" width="100"> 515 <el-table-column align="left" label="操作" width="100">
507 <template slot-scope="scope"> 516 <template slot-scope="scope">
...@@ -716,12 +725,14 @@ ...@@ -716,12 +725,14 @@
716 value: "destinationCountryRegionCode", 725 value: "destinationCountryRegionCode",
717 width: "", 726 width: "",
718 align: "left", 727 align: "left",
728 + slot:true
719 }, 729 },
720 { 730 {
721 name: "计量单位", 731 name: "计量单位",
722 value: "unit", 732 value: "unit",
723 width: "", 733 width: "",
724 align: "left", 734 align: "left",
735 + slot:true
725 }, 736 },
726 { 737 {
727 name: "数量", 738 name: "数量",
...@@ -740,6 +751,7 @@ ...@@ -740,6 +751,7 @@
740 value: "currency", 751 value: "currency",
741 width: "", 752 width: "",
742 align: "left", 753 align: "left",
754 + slot:true
743 }, 755 },
744 { 756 {
745 name: "单价", 757 name: "单价",
...@@ -786,6 +798,12 @@ ...@@ -786,6 +798,12 @@
786 } 798 }
787 }, 799 },
788 methods: { 800 methods: {
801 + mapDicDatas(dicArr, code){
802 + return dicArr.filter(item => item.itemCode == code)[0].itemChineseName
803 + },
804 + mapCurrencyDatas(dicArr, code){
805 + return dicArr.filter(item => item.itemValue == code)[0].itemChineseName
806 + },
789 //获取客户下拉列表数据 807 //获取客户下拉列表数据
790 queryCustomerList(){ 808 queryCustomerList(){
791 getCustomerList().then(res =>{ 809 getCustomerList().then(res =>{
...@@ -876,11 +894,24 @@ ...@@ -876,11 +894,24 @@
876 table.scrollTop = row.gnum*51+10 894 table.scrollTop = row.gnum*51+10
877 }) 895 })
878 }, 896 },
897 + getTotalNumber(){
898 + let totalNetWeight = 0;
899 + let totalGoodsValue = 0
900 + for (let i=0; i<this.detailData.length; i++) {
901 + totalNetWeight += Number(this.detailData[i].netWeight)
902 + totalGoodsValue += Number(this.detailData[i].totalPrice)
903 + }
904 + this.formData.netWeight = totalNetWeight
905 + this.formData.goodsValue = totalGoodsValue
906 + },
879 deleteRow(row){ 907 deleteRow(row){
880 this.detailData = this.detailData.filter(item => item.gnum !=row.gnum).map((item, index) =>{ 908 this.detailData = this.detailData.filter(item => item.gnum !=row.gnum).map((item, index) =>{
881 item.gnum = index+1 909 item.gnum = index+1
882 return item 910 return item
883 }) 911 })
912 + this.$nextTick(()=>{
913 + this.getTotalNumber()
914 + })
884 }, 915 },
885 rowFormDataSave(props){ 916 rowFormDataSave(props){
886 this.detailData.map(item =>{ 917 this.detailData.map(item =>{
...@@ -890,6 +921,9 @@ ...@@ -890,6 +921,9 @@
890 } 921 }
891 }) 922 })
892 this.expandRowKeys = [] 923 this.expandRowKeys = []
924 + this.$nextTick(()=>{
925 + this.getTotalNumber()
926 + })
893 }, 927 },
894 cancelEditRowData(){ 928 cancelEditRowData(){
895 this.expandRowKeys = [] 929 this.expandRowKeys = []
......