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

@@ -265,7 +265,33 @@
         <section class="dlTitle">
           <h3>密码机管理</h3>
         </section>
-        <el-row>
+        <el-row :gutter="5">
+          <el-col :span="8">
+            <Formitem label="证书序列号" prop="certificateSerialNumber" type="edit">
+              <el-input
+                type="text"
+                class="inputShadow"
+                id="inputInner-edit-certificateSerialNumber"
+                resize="none"
+                v-model="formData.certificateSerialNumber"
+                clearable
+                placeholder=""
+              ></el-input>
+            </Formitem>
+          </el-col>
+          <el-col :span="8">
+            <Formitem label="证书索引号" prop="certificateIndexNumber" type="edit">
+              <el-input
+                type="text"
+                class="inputShadow"
+                id="inputInner-edit-certificateIndexNumber"
+                resize="none"
+                v-model="formData.certificateIndexNumber"
+                clearable
+                placeholder=""
+              ></el-input>
+            </Formitem>
+          </el-col>
         <el-col :span="16" style="padding-right: 5px;">
         <div class="uploadItem">
           <div class="uploadbox">
@@ -321,19 +347,7 @@
           </div>
         </div>
         </el-col>
-        <el-col :span="8">
-            <Formitem label="证书序列号" prop="certificateSerialNumber" type="edit">
-              <el-input
-                type="text"
-                class="inputShadow"
-                id="inputInner-edit-certificateSerialNumber"
-                resize="none"
-                v-model="formData.certificateSerialNumber"
-                clearable
-                placeholder=""
-              ></el-input>
-            </Formitem>
-          </el-col>
+
        </el-row>
         </div>
       </el-form>
@@ -402,6 +416,7 @@ export default {
         ecomEntName: "",
         orderRequester: "",
         certificateSerialNumber: "",
+        certificateIndexNumber: "",
         qingdaoKey: "",
         qingdaoUserDxpid: "",
         qingdaoDanyiUserDxpid:"",
@@ -784,6 +799,7 @@ export default {
         ecomEntName: "",
         orderRequester: "",
         certificateSerialNumber: "",
+        certificateIndexNumber: "",
         qingdaoKey: "",
         qingdaoUserDxpid: "",
         qingdaoDanyiUserDxpid:"",

@@ -129,7 +129,7 @@
                                 v-for="(item, index) in $store.getters.dict.COUNTRY_REGION_CODE"
                                 :key="index"
                                 :label="item.itemChineseName"
-                                :value="item.itemValue"
+                                :value="item.itemCode"
                                 ></el-option>
                             </el-select>
                         </Formitem>
@@ -351,9 +351,6 @@
         }
       };
     },
-    watch: {
-
-    },
     methods: {
         rowFormDataSave(){
             this.$refs.editRowForm.validate((valid) => {

@@ -462,7 +462,7 @@
             <el-col :span="6">
                   <Formitem label="备注" prop="remark">
                   <el-input
-                      type="textarea"
+                      type="text"
                       class="inputShadow"
                       id="inputInner--remark"
                       resize="none"
@@ -502,6 +502,15 @@
               @rowFormDataSave="rowFormDataSave"
               />                
             </template>
+            <template v-slot:destinationCountryRegionCode="scope">
+              <span>{{ mapDicDatas($store.getters.dict.COUNTRY_REGION_CODE, scope.row.destinationCountryRegionCode) }}</span>              
+            </template>
+            <template v-slot:unit="scope">
+              <span>{{ mapDicDatas($store.getters.dict.MEASUREMENT_UNIT, scope.row.unit) }}</span>              
+            </template>
+            <template v-slot:currency="scope">
+              <span>{{ mapCurrencyDatas($store.getters.dict.CURRENCY, scope.row.currency) }}</span>              
+            </template>
             <template slot="optionColumn">
                 <el-table-column align="left" label="操作" width="100">
                 <template slot-scope="scope">
@@ -716,12 +725,14 @@
             value: "destinationCountryRegionCode",
             width: "",
             align: "left",
+            slot:true
           },
           {
             name: "计量单位",
             value: "unit",
             width: "",
             align: "left",
+            slot:true
           },
           {
             name: "数量",
@@ -740,6 +751,7 @@
             value: "currency",
             width: "",
             align: "left",
+            slot:true
           },
           {
             name: "单价",
@@ -786,6 +798,12 @@
       }
     },
     methods: {
+        mapDicDatas(dicArr, code){
+          return dicArr.filter(item => item.itemCode == code)[0].itemChineseName
+        },
+        mapCurrencyDatas(dicArr, code){
+          return dicArr.filter(item => item.itemValue == code)[0].itemChineseName
+        },
         //获取客户下拉列表数据
         queryCustomerList(){
             getCustomerList().then(res =>{
@@ -876,11 +894,24 @@
             table.scrollTop = row.gnum*51+10
         })
       },
+      getTotalNumber(){
+        let totalNetWeight = 0;
+         let totalGoodsValue = 0
+         for (let i=0; i<this.detailData.length; i++) {
+            totalNetWeight += Number(this.detailData[i].netWeight)
+            totalGoodsValue += Number(this.detailData[i].totalPrice)
+         }
+         this.formData.netWeight = totalNetWeight
+         this.formData.goodsValue = totalGoodsValue
+      },
       deleteRow(row){
         this.detailData = this.detailData.filter(item => item.gnum !=row.gnum).map((item, index) =>{
             item.gnum = index+1
             return item
         })
+        this.$nextTick(()=>{
+          this.getTotalNumber()
+        })
       },
       rowFormDataSave(props){
          this.detailData.map(item =>{
@@ -890,6 +921,9 @@
             }
          })
          this.expandRowKeys = []
+         this.$nextTick(()=>{
+          this.getTotalNumber()
+        })
       },
       cancelEditRowData(){
         this.expandRowKeys = []