财务管理国际化

src/api/ecw/box.js

@@ -154,7 +154,6 @@ export function cancelBillService(id) {
 export function downloadBillService(params) {
   return request({
     url: "/shipment/make-bill-of-lading/download",
-    responseType: "blob",
     method: "get",
     params,
   });

src/views/ecw/box/indexSea.vue

@@ -119,7 +119,7 @@
               {{$t('操作')}}<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="edit">{{$t('编辑')}}</el-dropdown-item>
+              <el-dropdown-item :disabled="scope.row.ldStatus>=46" command="edit">{{$t('编辑')}}</el-dropdown-item>
               <el-dropdown-item command="sea">{{$t('操作-海运')}}</el-dropdown-item>
               <el-dropdown-item command="error">{{$t('异常登记')}}</el-dropdown-item>
               <el-dropdown-item command="cost">{{$t('费用登记')}}</el-dropdown-item>

src/views/ecw/box/indexSeaAir.vue

@@ -111,7 +111,7 @@
               {{$t('操作')}}<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="edit">{{$t('编辑')}}</el-dropdown-item>
+              <el-dropdown-item :disabled="scope.row.ldStatus>=46" command="edit">{{$t('编辑')}}</el-dropdown-item>
               <el-dropdown-item command="seaAir">{{$t('操作')}}-{{$t('海空联运')}}</el-dropdown-item>
               <el-dropdown-item command="error">{{$t('异常登记')}}</el-dropdown-item>
               <el-dropdown-item command="cost">{{$t('费用登记')}}</el-dropdown-item>

src/views/ecw/box/ladingBill/index.vue

@@ -80,7 +80,7 @@
     </el-row>
 
     <el-dialog :title="dialogCfg.title" :visible.sync="dialogCfg.visible" :width="dialogCfg.width" :fullscreen="dialogCfg.fullscreen" append-to-body class="shippingSea-dialog">
-      <makeLadingBill v-if="['makeBill','queryBill','resetBill'].includes(dialogCfg.type)" :currData="currData" :currRow="currRow" :dialogCfg="dialogCfg" @closeDialog="closeDialog" />
+      <makeLadingBill v-if="['makeBill','queryBill','resetBill'].includes(dialogCfg.type)" :currData="currData" :currRow="currRow" :dialogCfg="dialogCfg" @closeDialog="closeDialog" :selfNo="shipmentObj.selfNo" />
       <previewBill v-if="dialogCfg.type === 'previewBill'" :contentHtml="currData.billContent" :currRow="currRow" :type="dialogCfg.type" />
     </el-dialog>
   </el-row>

src/views/ecw/box/ladingBill/makeLadingBill.vue

@@ -60,6 +60,7 @@ export default {
     currData: Object,
     currRow: Object,
     dialogCfg: Object,
+    selfNo: String
   },
   data() {
     return {
@@ -190,7 +191,9 @@ export default {
         /* doc.save("a4.pdf");
         return Promise.reject() */
         let form = new FormData()
-        form.append('file', new File([doc.output('arraybuffer')], Date.now() + '.pdf', {type: 'application/pdf'}))
+        let file = this.selfNo + '-' + this.currRow.tidanNo + '.pdf'
+        form.append('file', new File([doc.output('arraybuffer')], file, {type: 'application/pdf'}))
+        form.append('path', file)
         return uploadFile(form)
       }).then(res => {
         return this.submit(res.data)

src/views/ecw/box/ladingBill/previewBill.vue

@@ -10,7 +10,8 @@
 
 <script>
 import lodop from "@/utils/lodop";
-import { downloadFile } from "../shippingSea/utils";
+import * as _BOX from "@/api/ecw/box";
+import FileSaver from "file-saver";
 
 export default {
   name: "previewBill",
@@ -21,12 +22,11 @@ export default {
   },
   methods: {
     download() {
-      downloadFile(
-        "downloadBillService",
-        { id: this.currRow.id },
-        this.currRow.orderNo + ".pdf",
-        "pdf"
-      );
+      _BOX["downloadBillService"]({ id: this.currRow.id }).then((res) => {
+        if (res.data && res.data.imgUrl) {
+          FileSaver.saveAs(res.data.imgUrl, res.data.imgUrl.split('/').pop());
+        }
+      });
     },
     print() {
       lodop()

src/views/ecw/coupon/edit.vue

@@ -88,10 +88,13 @@
 					/
 					<selector v-model="item.prodUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable style="width:100px" />
 					</template>
-
-					<el-button class="el-icon-plus" size="mini" type="primary" @click="fee[1].push({type:1})" />
-					<el-button v-if="fee[1].length > 1" class="el-icon-minus" size="mini" type="danger" @click="fee[1].splice(index,1)" />
-					<div class="red-tips" v-if="errTips[1] && errTips[1][index]">{{errTips[1][index]}}</div>
+					
+					<!-- 特价只有一行，不显示增删 -->
+					<template v-if="form.type != 6">
+						<el-button class="el-icon-plus" size="mini" type="primary" @click="fee[1].push({type:1})" />
+						<el-button v-if="fee[1].length > 1" class="el-icon-minus" size="mini" type="danger" @click="fee[1].splice(index,1)" />
+					</template>
+					<!-- <div class="red-tips" v-if="errTips[1] && errTips[1][index]">{{errTips[1][index]}}</div> -->
 				</div>
 			</el-form-item>
 
@@ -127,9 +130,12 @@
 					/
 					<selector v-model="item.prodUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable style="width:100px" />
 					</template>
+					<!-- 特价只有一行，不显示增删 -->
+					<template v-if="form.type != 6">
+						<el-button class="el-icon-plus" size="mini" type="primary" @click="fee[2].push({type:2})" />
+						<el-button v-if="fee[2].length > 1" class="el-icon-minus" size="mini" type="danger" @click="fee[2].splice(index,1)" />
+					</template>
 
-					<el-button class="el-icon-plus" size="mini" type="primary" @click="fee[2].push({type:2})" />
-					<el-button v-if="fee[2].length > 1" class="el-icon-minus" size="mini" type="danger" @click="fee[2].splice(index,1)" />
 					<!-- <div class="red-tips" v-if="errTips[2] && errTips[1][index]">{{errTips[2][index]}}</div> -->
 				</div>
 
@@ -383,6 +389,12 @@ export default {
 		  }
         }
 
+		// 没有优惠券ID的情况下才对特价做处理，有id则表示查看和编辑不做处理
+		if(!this.form.couponId && val == 6){
+			this.fee[1] = [{type:1}]
+			this.fee[2] = [{type:2}]
+		}
+
 		// 过一遍费用，禁用/启用、同步 部分货币单位
 		[1,2].forEach(index => {
 			this.fee[index].forEach(item => {
@@ -613,7 +625,7 @@ export default {
 						// 满减需要 先删除单位，防止编辑的时候切换单位导致两个同时存在
 						delete item.fullCurrencyId
 						delete item.prodUnit
-						
+
 						let tmp = item.combUnit.split('_')
 						item[tmp[0]] = tmp[1]
 					}

src/views/ecw/order/components/PrintLadingBill.vue

@@ -85,7 +85,7 @@ export default {
         
         download(){
             let blob = new Blob([this.pdfData], {type: "application/pdf"})
-            FileSaver.saveAs(blob, this.title + '.pdf'); 
+            FileSaver.saveAs(blob, this.detail.imgUrl.split("/").pop()); 
         },
         print(){
             lodop().then(LODOP => {

src/views/ecw/productPrice/edit.vue

@@ -107,7 +107,7 @@
             <el-form-item :label="$t('默认清关费')" v-if="form.priceType != 1" :prop="`priceStepList.${index}.transportPrice`" :rules="{validator: priceValidator, trigger: 'blur',   message: '价格错误'}">
               <inputor default2="0" v-model.number="item.clearancePrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" :rules="{validator: priceValidator, trigger: 'blur',   message: '价格错误'}"/>
               <selector :disabled="index > 0" @input="syncAllUnit" v-model="item.clearancePriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable  class="w-100" />
-              / <selector :disabled="index > 0" @input="syncAllUnit" v-model="item.clearanceVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable  class="w-100" />
+              / <selector disabled @input="syncAllUnit" v-model="item.clearanceVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable  class="w-100" />
             </el-form-item>
 
             <el-form-item
@@ -148,7 +148,7 @@
                 <selector v-model="form.clearancePriceUnit" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable2 class="w-100 mr-10" />
                 <inputor default2="0" v-model.number="form.clearancePrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" />
                 <span class="mr-10">/</span>
-                <selector v-model="form.clearanceVolumeUnit" :options="unitList" :label-field="$l('title')" value-field="id" defaultable2 class="w-100" />
+                <selector disabled v-model="form.clearanceVolumeUnit" :options="unitList" :label-field="$l('title')" value-field="id" defaultable2 class="w-100" />
             </el-form-item>
           </template>
 
@@ -436,6 +436,7 @@ export default {
       // 最小其计量
       this.$set(this.form, 'minWeightUnit', transportVolumeUnit)
       this.syncSpecialUnit({transportVolumeUnit})
+      this.form.clearanceVolumeUnit = transportVolumeUnit // 清关费体积单位同步运费体积单位
     },
     'form.clearanceVolumeUnit'(clearanceVolumeUnit){
       this.syncSpecialUnit({clearanceVolumeUnit})
@@ -645,7 +646,7 @@ export default {
           transportPriceUnit:  obj.transportPriceUnit,
           transportVolumeUnit: obj.transportVolumeUnit,
           clearancePriceUnit:  obj.clearancePriceUnit,
-          clearanceVolumeUnit: obj.clearanceVolumeUnit,
+          clearanceVolumeUnit: obj.transportVolumeUnit, // 清关费和运费的体积单位同步
         }
       }
 

src/views/system/helpDoc/info.vue

@@ -3,7 +3,7 @@
     <el-collapse v-model="activeNames">
       <div v-for="item in helpData" :key="item.id">
         <el-collapse-item :title="item.titleZh" :name="item.id">
-          <span v-html="item.contentZh">{{ item.contentZh }}</span>
+          <div v-html="item.contentZh" class="img">{{ item.contentZh }}</div>
         </el-collapse-item>
       </div>
     </el-collapse>
@@ -32,4 +32,7 @@ export default {
   .infoheader{
     padding:20px
   }
+  ::v-deep img{
+    max-width: 100%;
+  }
 </style>