单证订单数据 字段修改

src/views/order/orderList.vue

@@ -1,4 +1,4 @@
-<template>
+c<template>
   <!-- 【单证】 订单数据 -->
   <div id="orderList">
     <a-card :bordered="false">
@@ -149,19 +149,19 @@ export default {
         {
           title: '销售类型',
           width: 100,
-          dataIndex: 'salesTypeValue',
+          dataIndex: 'salesTypeText',
           className: 'replacecolor'
         },
-        { title: '客户简称', width: 150, dataIndex: 'customerAbbreviation', className: 'replacecolor' },
+        { title: '客户简称', width: 220, dataIndex: 'customerAbbreviation', align: 'left', className: 'replacecolor' },
         { title: '客户名称', width: 220, dataIndex: 'customerName', align: 'left', className: 'replacecolor' },
         { title: '供应商', width: 120, dataIndex: 'supplier', className: 'replacecolor' },
         { title: '汇率', width: 90, dataIndex: 'exchangeRate', className: 'replacecolor' },
         { title: '整单合计', width: 120, dataIndex: 'wholeOrderTotal', className: 'replacecolor' },
         { title: '销售部门', width: 100, dataIndex: 'salesDepartment', className: 'replacecolor' },
         { title: '业务员', width: 140, dataIndex: 'salesman', className: 'replacecolor' },
-        { title: '币种', width: 90, dataIndex: 'currencyValue', className: 'replacecolor' },
-        { title: '品牌方', width: 120, dataIndex: 'brandSide', className: 'replacecolor' },
-        { title: '第三方', width: 120, dataIndex: 'thirdParty', className: 'replacecolor' },
+        { title: '币种', width: 90, dataIndex: 'currencyText', className: 'replacecolor' },
+        { title: '品牌方', width: 220, dataIndex: 'brandSide',align: 'left', className: 'replacecolor' },
+        { title: '第三方', width: 220, dataIndex: 'thirdParty',  align: 'left', className: 'replacecolor' },
         { title: '定金比例(%)', width: 120, dataIndex: 'depositRatio', className: 'replacecolor' },
         { title: '定金', width: 100, dataIndex: 'deposit', className: 'replacecolor' },
         { title: '协同路线', width: 160, dataIndex: 'collaborativeRoute', className: 'replacecolor' },

src/views/shipment-details/itemNumEleModal.vue

@@ -30,8 +30,8 @@
               <a-form-model-item label="是否做TC证书" prop="isTc">
                 <a-select v-model="editItemNumber.isTc">
                   <a-select-option value="">请选择</a-select-option>
-                  <a-select-option :value="1">是</a-select-option>
-                  <a-select-option :value="0">否</a-select-option>
+                  <a-select-option value="1">是</a-select-option>
+                  <a-select-option value="0">否</a-select-option>
                 </a-select>
               </a-form-model-item>
             </a-col>

src/views/shipment-details/shipmentList.vue

@@ -321,7 +321,7 @@ export default {
           width: 180,
           className: 'replacecolor'
         },
-         {
+        {
           title: '物料成分',
           dataIndex: 'materialComposition',
           width: 180,
@@ -540,12 +540,11 @@ export default {
     //  维护款号成分
     itemNumberElement(record) {
       this.$refs.itemNumEleModal.itemNumEleModVis = true
-      shipmentQueryById({ id: record.id }).then(res => {
-        if (res.success) {
-          console.log('点击的对象', res.result)
-          this.$refs.itemNumEleModal.editItemNumber = res.result
-        }
-      })
+      // console.log('record.itemNumber', record.itemNumber)
+      this.$refs.itemNumEleModal.editItemNumber.itemIds = record.itemIds
+      this.$refs.itemNumEleModal.editItemNumber.itemNumber = record.itemNumber
+      this.$refs.itemNumEleModal.editItemNumber.materialComposition = record.materialComposition
+      this.$refs.itemNumEleModal.editItemNumber.isTc = record.isTc
     },
 
     //  详情