优化报价单

src/components/WorkFlow/index.vue

 <template>
     <div>
-        <my-process-viewer
-            ref="processViewer"
-            :value="bpmnXML"
-            :prefix="prefix"
-            :activityData="activityData"
-            :processInstanceData="processInstanceData"
-            :taskData="taskData"
-            style="height:500px; margin-bottom:10px"
-        />
+        <div style="height:350px; overflow:hidden;">
+            <my-process-viewer
+                ref="processViewer"
+                :value="bpmnXML"
+                :prefix="prefix"
+                :activityData="activityData"
+                :processInstanceData="processInstanceData"
+                :taskData="taskData"
+                style="height:500px; margin-top: -80px"
+            />
+        </div>
         <el-form label-position="left" label-width="100px">
           <el-form-item label="抄送">
             <el-select v-model="valueSync" multiple placeholder="请选择抄送人" style="width:100%">

src/views/ecw/order/edit.vue

@@ -232,7 +232,6 @@
                     <div>{{fee.clearanceUSD || 0}}美元</div>
                 </el-descriptions-item>
                 <el-descriptions-item label="其他费用">
-                    <!--TODO 缺少其他费用字段-->
                     <el-input v-model="form.otherFee" placeholder="" style="width:100px"></el-input>
                     <selector v-model="form.otherFeeCurrencyId" :options="currencyList" label-field="titleZh" value-field="id" defaultable style="width:100px" />
                 </el-descriptions-item>
@@ -250,12 +249,15 @@
               <el-col :span="2">{{index+1}}.{{item.label}}</el-col>
               <el-col :span="4">
                 <el-select placeholder="请选择优惠" v-model="selectedCoupons[item.value]" :data-type="item.value" clearable>
-                    <template v-for="coupon in couponList">
-                        <el-option v-if="coupon.type == +item.value" :key="coupon.couponId" :label="coupon.titleZh" :value="coupon.couponId"></el-option>
+                    <template v-for="(coupon, index) in couponList">
+                        <el-option v-if="coupon.type == +item.value" :key="coupon.couponId + '_' + index" :label="coupon.titleZh" :value="coupon.couponId"></el-option>
                     </template>
                 </el-select>
               </el-col>
-              <el-col :span="2" v-if="getCoupon(selectedCoupons[item.value])"> -{{getCoupon(selectedCoupons[item.value]).reduceAmount}} 美元</el-col>
+              <el-col :span="2" v-if="getCoupon(selectedCoupons[item.value])">
+                -{{getCoupon(selectedCoupons[item.value]).reduceAmount}} 
+                {{currentcyMap[getCoupon(selectedCoupons[item.value]).reduceCurrencyId]}}
+              </el-col>
               <el-col :span="5" v-if="getCoupon(selectedCoupons[item.value])">有效期：{{getCoupon(selectedCoupons[item.value]).endTime || '永久有效'}}</el-col>
             </el-row>
             <el-descriptions :column="1" border>

src/views/ecw/order/index.vue

@@ -133,7 +133,7 @@
       <el-table-column label="体积/重量" align="center" prop="sumWeight">
         <template slot-scope="{row}">{{row.totalVolume}}m³ /{{row.totalWeight}}Kg</template>
       </el-table-column>
-
+      <el-table-column label="始发仓" align="center" prop="departureName" />
       <el-table-column label="运输方式/目的地" align="center" prop="transportId">
         <template slot-scope="{row}">
           <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportId" /> / {{row.objectiveName}}