Merge remote-tracking branch 'origin/dev' into dev

src/components/fee-info/main.vue

@@ -16,14 +16,6 @@
         <template slot="menu" slot-scope="{ row, index }">
           <el-button
             size="small"
-            icon="el-icon-refresh"
-            type="text"
-            @click="rePick(row, index)"
-            :disabled="disabled"
-            >重选</el-button
-          >
-          <el-button
-            size="small"
             icon="el-icon-edit"
             type="text"
             @click="rowCell(row, index)"
@@ -39,6 +31,16 @@
             >删 除</el-button
           >
         </template>
+        <template slot="feeName" slot-scope="{ row, index }">
+          <span>{{ row.feeName }}</span>
+          <el-button
+            size="small"
+            type="text"
+            @click="rePick(row, index)"
+            :disabled="disabled"
+            >选择</el-button
+          >
+        </template>
         <template slot="price" slot-scope="{ row }">
           <el-input
             v-if="row.$cellEdit"

src/enums/column-name.js

@@ -40,6 +40,42 @@ const columnName = [{
 }, {
   code: 13,
   name: '出口船务询价商品信息'
+}, {
+  code: 14,
+  name: '国内销售订单'
+}, {
+  code: 15,
+  name: '国内销售订单商品明细'
+}, {
+  code: 16,
+  name: '国内销售订单费用明细'
+}, {
+  code: 17,
+  name: '国内采购订单'
+}, {
+  code: 18,
+  name: '国内采购订单商品明细'
+}, {
+  code: 19,
+  name: '国内采购订单费用明细'
+}, {
+  code: 20,
+  name: '国内发货单'
+}, {
+  code: 21,
+  name: '国内发货单商品明细'
+}, {
+  code: 22,
+  name: '国内发货单费用明细'
+}, {
+  code: 23,
+  name: '国内收货单'
+}, {
+  code: 24,
+  name: '国内发货单商品明细'
+}, {
+  code: 25,
+  name: '国内发货单费用明细'
 }]
 export const getColumnName = (key) => {
   for (let index = 0; index < columnName.length; index++) {

src/page/index/tags.vue

@@ -136,7 +136,7 @@ import {clearCache} from "@/api/user";
       menuTag(value, action) {
         if (action === "remove") {
           let {tag, key} = this.findTag(value);
-          if(tag.label=="出口发货单"){
+          if(tag.label=="发货单(E)"){
             this.$store.commit("OUT_OUT_DETAIL");
           }
             if(tag.label=="国内发货单"){

src/router/views/index.js

@@ -307,7 +307,7 @@ export default [{
     children: [
       {
         path: '/exportTrade/customerInquiry/index',
-        name:'出口报价单',
+        name:'报价单(E)',
         meta: {
           keepAlive: true,
         },
@@ -323,7 +323,7 @@ export default [{
       children: [
         {
           path: '/exportTrade/purchaseInquiry/index',
-          name:'出口采购询价',
+          name:'采购询价(E)',
           meta: {
             keepAlive: true,
           },
@@ -339,7 +339,7 @@ export default [{
           children: [
             {
               path: '/exportTrade/shippingInquiry/index',
-              name:'出口船务询价',
+              name:'船务询价(E)',
               meta: {
                 keepAlive: true,
               },
@@ -355,7 +355,7 @@ export default [{
     children: [
       {
         path: '/exportTrade/salesContract/index',
-        name:'出口销售订单',
+        name:'销售订单(E)',
         meta: {
           keepAlive: true,
         },
@@ -371,7 +371,7 @@ export default [{
     children: [
       {
         path: '/exportTrade/purchaseContract/index',
-        name:'出口采购订单',
+        name:'采购订单(E)',
         meta: {
           keepAlive: true,
         },
@@ -404,7 +404,7 @@ export default [{
     children: [
       {
         path: '/exportTrade/receipt/index',
-        name:"出口收货单",
+        name:"收货单(E)",
         meta: {
           keepAlive:true,
         },
@@ -420,7 +420,7 @@ export default [{
     children: [
       {
         path: '/exportTrade/invoice/index',
-        name:"出口发货单",
+        name:"发货单(E)",
         meta: {
           keepAlive:true,
         },

src/store/modules/ifdetail.js

@@ -73,7 +73,7 @@ const ifdetail = {
       if (tag.label == "进口收货单") {
         state.goStatus = true;
       }
-      if (tag.label == '出口发货单') {
+      if (tag.label == '发货单(E)') {
         state.takeStatus = true;
       }
       if (tag.label == '付款管理') {

src/views/exportTrade/customerInquiry/config/customerContact.json

@@ -8,7 +8,7 @@
   "addBtn": false,
   "delBtn":false,
   "align": "center",
-  "menuWidth": 100,
+  "menuWidth": 150,
   "refreshBtn": false,
   "column": [{
       "label": "产品类别",

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -97,12 +97,20 @@
               >船务询价</el-button
             >
           </template>
-          <template slot="menu" slot-scope="scope">
+          <template slot="menu" slot-scope="{ row,index }">
             <el-button
               size="small"
               icon="el-icon-edit"
               type="text"
-              @click="rowDel(scope.row, scope.index)"
+              @click="rowCell(row, index)"
+              :disabled="disabled"
+              >{{ row.$cellEdit ? "保存" : "修改" }}</el-button
+            >
+            <el-button
+              size="small"
+              icon="el-icon-edit"
+              type="text"
+              @click="rowDel(row, index)"
               :disabled="detailData.status == 1"
               >删 除</el-button
             >
@@ -520,6 +528,13 @@ export default {
     }
   },
   methods: {
+    rowCell(row, index) {
+      if (row.$cellEdit == true) {
+        this.$set(row, "$cellEdit", false);
+      } else {
+        this.$set(row, "$cellEdit", true);
+      }
+    },
     itemTypeFocus(row) {
       this.itemtypeList = [];
       getSpecification({ goodId: row.itemId }).then(res => {
@@ -593,7 +608,6 @@ export default {
       }
     },
     rowSave(row) {
-      console.log(row);
       this.$set(row, "$cellEdit", false);
     },
     rowDel(row, index) {

src/views/exportTrade/purchaseContract/config/customerContact.json

@@ -7,8 +7,9 @@
   "viewBtn": false,
   "editBtn": false,
   "addBtn":false,
+  "delBtn":false,
   "align": "center",
-  "menuWidth": 80,
+  "menuWidth": 150,
   "refreshBtn": false,
   "selection": true,
   "column": [{

src/views/exportTrade/purchaseContract/detailsPage.vue

@@ -112,13 +112,21 @@
                 >报 表</el-button
               >
             </template>
-            <template slot="menu" slot-scope="scope">
+            <template slot="menu" slot-scope="{ row, index }">
               <el-button
-                v-if="scope.row.$cellEdit"
                 size="small"
                 icon="el-icon-edit"
                 type="text"
-                @click="rowDel(scope.row, scope.index)"
+                @click="rowCell(row, index)"
+                :disabled="disabled"
+                >{{ row.$cellEdit ? "保存" : "修改" }}</el-button
+              >
+              <el-button
+                size="small"
+                icon="el-icon-edit"
+                type="text"
+                @click="rowDel(row, index)"
+                :disabled="detailData.status == 1"
                 >删 除</el-button
               >
             </template>
@@ -472,7 +480,7 @@ export default {
       orderFeesList: [],
       orderFilesList: [],
       orderItemIds: [],
-      itemtypeList:[]
+      itemtypeList: []
     };
   },
   props: {
@@ -521,6 +529,13 @@ export default {
     }
   },
   methods: {
+    rowCell(row, index) {
+      if (row.$cellEdit == true) {
+        this.$set(row, "$cellEdit", false);
+      } else {
+        this.$set(row, "$cellEdit", true);
+      }
+    },
     itemTypeFocus(row) {
       this.itemtypeList = [];
       getSpecification({ goodId: row.itemId }).then(res => {

src/views/exportTrade/purchaseInquiry/config/customerContact.json

@@ -6,8 +6,9 @@
   "viewBtn": false,
   "editBtn": false,
   "addBtn":false,
+  "delBtn":false,
   "align": "center",
-  "menuWidth": 80,
+  "menuWidth": 150,
   "refreshBtn": false,
   "column": [{
       "label": "产品类别",

src/views/exportTrade/purchaseInquiry/detailsPage.vue

@@ -117,13 +117,21 @@
               >报 表</el-button
             >
           </template>
-          <template slot="menu" slot-scope="scope">
+          <template slot="menu" slot-scope="{ row, index }">
             <el-button
-              v-if="scope.row.$cellEdit"
               size="small"
               icon="el-icon-edit"
               type="text"
-              @click="rowDel(scope.row, scope.index)"
+              @click="rowCell(row, index)"
+              :disabled="disabled"
+              >{{ row.$cellEdit ? "保存" : "修改" }}</el-button
+            >
+            <el-button
+              size="small"
+              icon="el-icon-edit"
+              type="text"
+              @click="rowDel(row, index)"
+              :disabled="detailData.status == 1"
               >删 除</el-button
             >
           </template>
@@ -433,7 +441,7 @@ export default {
       goodsList: [],
       selectionList: [],
       treeDeptId: null,
-      itemtypeList:[]
+      itemtypeList: []
     };
   },
   props: {
@@ -477,6 +485,13 @@ export default {
     });
   },
   methods: {
+    rowCell(row, index) {
+      if (row.$cellEdit == true) {
+        this.$set(row, "$cellEdit", false);
+      } else {
+        this.$set(row, "$cellEdit", true);
+      }
+    },
     itemTypeFocus(row) {
       this.itemtypeList = [];
       getSpecification({ goodId: row.itemId }).then(res => {

src/views/exportTrade/salesContract/config/customerContact.json

@@ -7,8 +7,9 @@
   "viewBtn": false,
   "editBtn": false,
   "addBtn":false,
+  "delBtn":false, 
   "align": "center",
-  "menuWidth": 80,
+  "menuWidth":150,
   "refreshBtn": false,
   "selection": true,
   "column": [{

src/views/exportTrade/salesContract/detailsPage.vue

@@ -132,13 +132,21 @@
                 >生成发货单
               </el-button>
             </template>
-            <template slot="menu" slot-scope="scope">
+            <template slot="menu" slot-scope="{ row, index }">
               <el-button
-                v-if="scope.row.$cellEdit"
                 size="small"
                 icon="el-icon-edit"
                 type="text"
-                @click="rowDel(scope.row, scope.index)"
+                @click="rowCell(row, index)"
+                :disabled="disabled"
+                >{{ row.$cellEdit ? "保存" : "修改" }}</el-button
+              >
+              <el-button
+                size="small"
+                icon="el-icon-edit"
+                type="text"
+                @click="rowDel(row, index)"
+                :disabled="detailData.status == 1"
                 >删 除</el-button
               >
             </template>
@@ -543,7 +551,7 @@ export default {
       orderFeesList: [],
       orderFilesList: [],
       orderItemIds: [],
-      itemtypeList:[]
+      itemtypeList: []
     };
   },
   props: {
@@ -597,6 +605,13 @@ export default {
     }
   },
   methods: {
+    rowCell(row, index) {
+      if (row.$cellEdit == true) {
+        this.$set(row, "$cellEdit", false);
+      } else {
+        this.$set(row, "$cellEdit", true);
+      }
+    },
     itemTypeFocus(row) {
       this.itemtypeList = [];
       getSpecification({ goodId: row.itemId }).then(res => {