Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/views/landTransportation/bulkCargo/detailPage.vue

@@ -2749,7 +2749,7 @@ export default {
         this.$message.success('保存成功');
         if (!this.goodsForm.id) {
           this.id = res.data.data
-          this.refreshData()
+          this.refreshData(res.data.data)
         } else {
           this.refreshData()
         }

src/views/landTransportation/dispatchingCars/detailPage.vue

@@ -2068,8 +2068,8 @@ export default {
             itemId: this.selectionList[0].id,
             // feeId: res.data.data.records.length > 0 ? res.data.data.records[0].id : '',
             // unit: '件数',
-            corpId: this.goodsForm.corpId,
-            corpName: this.goodsForm.corpName,
+            // corpId: this.goodsForm.corpId,
+            // corpName: this.goodsForm.corpName,
             // quantity: 1,
             orderId: this.id,
             $cellEdit: true
@@ -2089,9 +2089,9 @@ export default {
             currency: '1',
             type: '2',
             itemId: this.selectionList[0].id,
-            feeId: res.data.data.records.length > 0 ? res.data.data.records[0].id : '',
-            unit: '件数',
-            quantity: 1,
+            // feeId: res.data.data.records.length > 0 ? res.data.data.records[0].id : '',
+            // unit: '件数',
+            // quantity: 1,
             // corpId: '1526835847238901762',
             orderId: this.id,
             $cellEdit: true

src/views/reimbursement/config/customerContact.json

@@ -58,16 +58,22 @@
       "cell": true,
       "overHidden": true
     },{
+      "label": "支付方式",
+      "prop": "payMethod",
+      "index": 5,
+      "width": 120,
+      "overHidden": true
+    },{
       "label": "费用归属人",
       "prop": "expenseOwner",
-      "index": 5,
+      "index": 6,
       "width": 200,
       "overHidden": true,
       "cell": true
     },{
       "label": "数量",
       "prop": "quantity",
-      "index": 6,
+      "index": 7,
       "width": 200,
       "overHidden": true,
       "cell": true,
@@ -77,7 +83,7 @@
     },{
       "label": "单价",
       "prop": "price",
-      "index": 7,
+      "index": 8,
       "width": 200,
       "overHidden": true,
       "cell": true,
@@ -88,7 +94,7 @@
     {
       "label": "金额",
       "prop": "amount",
-      "index": 8,
+      "index": 9,
       "width": 140,
       "overHidden": true,
       "cell": true,
@@ -99,7 +105,7 @@
     {
       "label": "备注",
       "prop": "remarks",
-      "index": 9,
+      "index": 10,
       "width": 160,
       "overHidden": true,
       "cell": true

src/views/reimbursement/detail.vue

@@ -90,6 +90,12 @@
             </avue-cascader>
             <span v-else>{{ row.mold }}</span>
           </template>
+          <template slot="payMethod" slot-scope="{ row, index }">
+            <el-select v-model="row.payMethod" size="small" placeholder="请选择" clearable :disabled="!row.$cellEdit">
+              <el-option v-for="(item, index) in paymentOption" :key="index" :label="item.dictValue"
+                         :value="item.dictKey"></el-option>
+            </el-select>
+          </template>
         </avue-crud>
       </trade-card>
       <trade-card title="上传附件">