Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-web

src/views/book/addBookDrawer.vue

@@ -301,6 +301,7 @@
                       <a-select-option
                      v-for="(item,index) in FreightOption"
                      :key="index"
+                     @click="freightForwarderClick(item,record)"
                      :value="item.cvencode">
                      {{item.cvenname}}
                      </a-select-option>
@@ -313,6 +314,7 @@
                   <a-input placeholder="请输入金额" v-model="record.amount" />
                 </a-form-model-item>
                 </template>
+             
               <template slot="option" slot-scope="text, record, index">
                   <a-button type="primary"  @click="adsCNY">增行</a-button>
                   <a-divider type="vertical" />
@@ -327,6 +329,7 @@
                     <a-select-option
                      v-for="(item,index) in itemArrOption"
                      :key="index"
+                     @click="itemColumnClick(item,record)"
                      :value="item.value">
                      {{item.label}}
                      </a-select-option>
@@ -353,6 +356,7 @@
                       <a-select-option
                      v-for="(item,index) in FreightOption"
                      :key="index"
+                     @click="freightForwarderClick(item,record)"
                      :value="item.cvencode">
                      {{item.cvenname}}
                      </a-select-option>
@@ -379,6 +383,7 @@
                       <a-select-option
                      v-for="(item,index) in itemArrOption"
                      :key="index"
+                     @click="itemColumnClick(item,record)"
                      :value="item.value">
                      {{item.label}}
                      </a-select-option>
@@ -592,6 +597,12 @@ export default {
           width: 60,
           className: 'replacecolor'
         },
+        // {
+        //   title: '货代名称',
+        //   dataIndex: 'freightForwarderName',
+        //   width: 60,
+        //   className: 'replacecolor'
+        // },
         {
           title: '金额',
           dataIndex: 'amount',
@@ -606,6 +617,12 @@ export default {
           scopedSlots: { customRender: 'CNYProjectList' },
           className: 'replacecolor'
         },
+        // {
+        //   title: '项目名称',
+        //   dataIndex: 'itemColumnName',
+        //   width: 60,
+        //   className: 'replacecolor'
+        // },
         {
           title: '操作',
           dataIndex: 'option',
@@ -623,6 +640,12 @@ export default {
           width: 60,
           className: 'replacecolor'
         },
+        // {
+        //   title: '货代名称',
+        //   dataIndex: 'freightForwarderName',
+        //   width: 60,
+        //   className: 'replacecolor'
+        // },
         {
           title: '金额',
           dataIndex: 'amount',
@@ -637,6 +660,12 @@ export default {
           scopedSlots: { customRender: 'USDProjectList' },
           className: 'replacecolor'
         },
+        // {
+        //   title: '项目名称',
+        //   dataIndex: 'itemColumnName',
+        //   width: 60,
+        //   className: 'replacecolor'
+        // },
         {
           title: '操作',
           dataIndex: 'option',
@@ -1020,6 +1049,15 @@ export default {
       this.defaultMethod = 'add'
       this.$refs.form.resetFields()
     },
+    freightForwarderClick(val,record){
+     record.freightForwarderName = val.cvenname;
+     this.$forceUpdate();
+     
+    },
+    itemColumnClick(val,record){
+      record.itemColumnName = val.text;
+     this.$forceUpdate();
+    },
 
     // ------------------------------------------
     modalFormOk() {},

src/views/book/detailsBookDrawer.vue

@@ -396,22 +396,22 @@ export default {
       CNYColumns: [
         {
           title: '货代',
-          dataIndex: 'freightForwarder',
+          dataIndex: 'freightForwarderName',
           width: 60,
           className: 'replacecolor',
-          scopedSlots: { customRender: 'CNYfreighForward' },
+          //scopedSlots: { customRender: 'CNYfreighForward' },
         },
         {
           title: '金额',
           dataIndex: 'amount',
           width: 60,
           className: 'replacecolor',
-          scopedSlots: { customRender: 'CNYmoney' },
+          //scopedSlots: { customRender: 'CNYmoney' },
         },
         {
           title: '项目列',
-          dataIndex: 'itemColumn',
-          scopedSlots: { customRender: 'CNYProjectList' },
+          dataIndex: 'itemColumnName',
+         // scopedSlots: { customRender: 'CNYProjectList' },
           width: 60,
           className: 'replacecolor'
         }
@@ -420,23 +420,23 @@ export default {
       USDColumns: [
         {
           title: '货代',
-          dataIndex: 'freightForwarder',
-          scopedSlots: { customRender: 'USDfreighForward' },
-          width: 20,
+          dataIndex: 'freightForwarderName',
+         // scopedSlots: { customRender: 'USDfreighForward' },
+          width: 60,
           className: 'replacecolor'
         },
         {
           title: '金额',
           dataIndex: 'amount',
-          scopedSlots: { customRender: 'USDmoney' },
-          width: 20,
+          //scopedSlots: { customRender: 'USDmoney' },
+          width: 60,
           className: 'replacecolor'
         },
         {
           title: '项目列',
-          dataIndex: 'itemColumn',
-          width: 90,
-          scopedSlots: { customRender: 'USDProjectList' },
+          dataIndex: 'itemColumnName',
+          width: 60,
+          //scopedSlots: { customRender: 'USDProjectList' },
           className: 'replacecolor'
         }
       ],