Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206

src/model/Bdtdck/index.js

@@ -126,6 +126,7 @@ export default class Bdtdck{
 							setnowflg:"",			//  Register to Send and Settle Document		.bdtp.setnowflg
 							zcday:"",			//  装船日\\服务提供日		.bdtp.zcday
 							docgrdm:{
+								docgrd:"",		
 								docdsclab:"",			//  Label of document description		.bdtp.docgrdm.docdsclab
 							},
 							cre752flg:"",			//  Create 752		.bdtp.cre752flg

src/views/Business/Bdtdck/Docpre.vue

@@ -65,7 +65,7 @@
           </el-table-column>
           <el-table-column label="操作" width="170px" fixed="right">
             <template slot-scope="scope">
-              <c-button @click="deleteTable(scope.row)" type="primary">删除</c-button>
+              <c-button @click="deleteTable(scope.$index)" type="primary">删除</c-button>
             </template>
           </el-table-column>
         </c-table>
@@ -90,7 +90,8 @@
       <c-row>
         <c-col :span="24">
           <el-form-item label="收到的通知类" prop="bddgrp.rec.advtyp">
-            <c-select v-model="model.bddgrp.rec.advtyp" style="width:100%" placeholder="请选择Type of Advice Received" :disabled="true">
+            <c-select v-model="model.bddgrp.rec.advtyp" style="width:100%" placeholder="请选择Type of Advice Received"
+              :disabled="true">
             </c-select>
           </el-form-item>
         </c-col>
@@ -104,7 +105,8 @@
 
         <c-col :span="24">
           <el-form-item label="不符点通知日期" prop="bddgrp.rec.disdat">
-            <c-date-picker type="date" v-model="model.bddgrp.rec.disdat" style="width:100%" placeholder="请选择不符点通知日期" :disabled="true">
+            <c-date-picker type="date" v-model="model.bddgrp.rec.disdat" style="width:100%" placeholder="请选择不符点通知日期"
+              :disabled="true">
             </c-date-picker>
           </el-form-item>
         </c-col>
@@ -125,7 +127,8 @@
         </c-col>
 
         <c-col :span="24" :offset="8">
-          <c-checkbox v-model="model.bdtp.cre732flg" :disabled="!model.bddgrp.rec.acpnowflg != ''">Create MT 732</c-checkbox>
+          <c-checkbox v-model="model.bdtp.cre732flg" :disabled="!model.bddgrp.rec.acpnowflg != ''">Create MT 732
+          </c-checkbox>
         </c-col>
       </c-row>
     </c-col>
@@ -210,7 +213,7 @@ import Api from "~/service/Api"
 import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable"
 import Event from "~/model/Bdtdck/Event"
-
+import Utils from "~/utils";
 export default {
   inject: ['root'],
   props: ["model", "codes"],
@@ -230,6 +233,10 @@ export default {
         cmail1: "",
         cmail2: "",
         docnam: "",
+        description: "",
+        serialNum: "",
+        tableName: "",
+        tcddoc: "",
       },
       codeTable: [
         { label: "增值税发票", value: "1" },
@@ -246,21 +253,14 @@ export default {
   },
   methods: {
     ...Event,
-    addTableValue() {
-      var index = this.TableValue.length;
-      var newTableValue = this.newValue;
-      if (index > 0) {
-        newTableValue.id = this.TableValue[index - 1].id + 1;
-      }
-      this.TableValue.push(newTableValue);
+    addTableValue(index) {
+      var newTableValue = Object.assign({}, this.newValue);
+      const serial = Utils.generateUUID();
+      newTableValue.serialNum = serial;
+      this.model.bdtp.docgrdm.docgrd.splice(index - 1, 0, newTableValue);
     },
-    deleteTable(row) {
-      for (let i = 0; i < this.TableValue.length; i++) {
-        if (this.TableValue[i].id == row.id) {
-          this.TableValue.splice(i, 1);
-          break;
-        }
-      }
+    deleteTable(index) {
+      this.model.bdtp.docgrdm.docgrd.splice(index, 1);
     },
   },