Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

package.json

@@ -56,6 +56,7 @@
     "jsencrypt": "3.0.0-rc.1",
     "min-dash": "^3.5.2",
     "nprogress": "0.2.0",
+    "number-precision": "^1.5.2",
     "qrcode": "^1.5.1",
     "quill": "1.3.7",
     "screenfull": "5.0.2",

src/api/ecw/financial.js

@@ -9,6 +9,15 @@ export function createReceipt(data) {
   })
 }
 
+// 更新收款单
+export function updateReceipt(data) {
+  return request({
+    url: '/ecw/receipt/update',
+    method: 'put',
+    data: data
+  })
+}
+
 // 获取应收款列表
 export function getReceivableList(query) {
   return request({
@@ -18,6 +27,144 @@ export function getReceivableList(query) {
   })
 }
 
+// 获取应收款详情
+export function getReceivableInfoByIds(query) {
+  return request({
+    url: '/ecw/receivable/get',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取收款单列表
+export function getReceiptList(query) {
+  return request({
+    url: '/ecw/receipt/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 核销收款单
+export function receiptVerification(id) {
+  return request({
+    url: '/ecw/receipt/verification/' + id,
+    method: 'GET'
+  })
+}
+
+// 反核销收款单
+export function receiptVerificationCancel(id) {
+  return request({
+    url: '/ecw/receipt/verificationCancel/' + id,
+    method: 'GET'
+  })
+}
+
+// 获取收款单详情
+export function getReceiptInfoByIds(query) {
+  return request({
+    url: '/ecw/receipt/get',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取收款单明细列表
+export function getReceivableItemDetail(query) {
+  return request({
+    url: '/ecw/receipt/getReceivableItemDetail',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取收款单明细
+export function getInvoicingItem(query) {
+  return request({
+    url: '/ecw/receipt/getInvoicingItem',
+    method: 'get',
+    params: query
+  })
+}
+
+// 创建收款明细
+export function receiptItemCreate(data) {
+  return request({
+    url: '/ecw/receipt-item/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 根据收款单ID获得收款明细列表
+export function getReceivableItem(query) {
+  return request({
+    url: '/ecw/receipt-item/getReceivableItem',
+    method: 'get',
+    params: query
+  })
+}
+
+// 根据收款单ID获得收款账户细列表
+export function getReceiptAccountList(query) {
+  return request({
+    url: '/ecw/receipt/getReceiptAccountList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除收款明细
+export function deleteReceiptItem(id) {
+  return request({
+    url: '/ecw/receipt-item/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 更新收款明细
+export function updateReceiptItem(data) {
+  return request({
+    url: '/ecw/receipt-item/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 收款明细核销
+export function receiptItemVerification(id) {
+  return request({
+    url: '/ecw/receipt-item/verification/' + id,
+    method: 'GET'
+  })
+}
+
+// 反核销收款单
+export function receiptItemVerificationCancel(id) {
+  return request({
+    url: '/ecw/receipt-item/verificationCancel/' + id,
+    method: 'GET'
+  })
+}
+
+// 收款明细批量核销
+export function receiptItemBatchVerification(query) {
+  return request({
+    url: '/ecw/receipt-item/batchVerification',
+    method: 'GET',
+    params: query
+  })
+}
+
+// 收款单全部核销
+export function receiptItemAllVerification(id) {
+  return request({
+    url: '/ecw/receipt-item/allVerification/' + id,
+    method: 'GET'
+  })
+}
+
 // 根据获取应收款列表
 // export function getReceivableListByIds(query) {
 //   return request({
@@ -27,6 +174,41 @@ export function getReceivableList(query) {
 //   })
 // }
 
+// 导出收款单 Excel
+export function receiptExportExcel(query) {
+  return request({
+    url: '/ecw/receipt/export-excel',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除收款单
+export function deleteReceipt(id) {
+  return request({
+    url: '/ecw/receipt/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得收款单开票信息
+export function getReceiptInvoicing(id) {
+  return request({
+    url: '/ecw/receipt/invoicing/info/' + id,
+    method: 'get'
+  })
+}
+
+// 更新收款单开票信息
+export function updateReceiptInvoicing(data) {
+  return request({
+    url: '/ecw/receipt/invoicing/info',
+    method: 'put',
+    data: data
+  })
+}
+
+
 // 更新应付款
 export function updatePayable(data) {
   return request({

src/plugins/download.js

@@ -27,7 +27,6 @@ export default {
   download0(data, fileName, mineType) {
     // 创建 blob
     let blob = new Blob([data], {type: mineType});
-    debugger
     // 创建 href 超链接，点击进行下载
     window.URL = window.URL || window.webkitURL;
     let href = URL.createObjectURL(blob);

src/utils/dict.js

@@ -104,6 +104,7 @@ export const DICT_TYPE = {
   ECW_CUSTOM_DRAWEE: 'custom_drawee', // 自定义付款人费用类型
   ECW_IS_DRAFT: 'is_draft', // 草稿发布状态
   ECW_PAYMENT_STATE: 'payment_state',//付款单状态
+  ECW_INVOICING_TYPE: 'invoicing_type',
   ECW_PRICE_TYPE: 'price_type',
   //--------ecw---------
   CUSTOMER_STATUS: 'customer_status',
@@ -149,7 +150,7 @@ export const DICT_TYPE = {
   ORDER_ERROR_TYPE:'order_error_type',//订单异常类型
   ORDER_EXCEPTION_STATUS:'order_exception_status',//异常订单状态
   PAYMENT_TYPE:'payment_type',//收款类型
-  ORDER_WAREHOUSE_IN_STATUS: 'order_warehouse_in_status', // 入仓状态
+  ORDER_WAREHOUSE_IN_STATUS: 'order_warehouse_in_diff_status', // 入仓状态
   ORDER_NO_QUOTE_EXCEPTION_RESULT:'order_no_quote_exception_result',//未报价异常处理结果
   ORDER_SUPERFLUOUS_BOX_EXCEPTION_RESULT:'order_superfluous_box_exception_result',//多箱异常处理结果
   ORDER_LACI_BOX_EXCEPTION_RESULT:'order_lack_box_exception_result',//少箱异常处理结果

src/views/ecw/financial/creatPayment.vue

@@ -196,7 +196,11 @@
             <el-input v-model="scope.row.taxRate" @keyup.native="scope.row.taxRate = oninput(scope.row.taxRate)"></el-input>
           </template>
         </el-table-column>
-        <el-table-column label="价税合计(RMB)" align="center" prop="total" />
+        <el-table-column label="价税合计(RMB)" align="center" prop="total" >
+          <template slot-scope="scope">
+           <span>{{ scope.row.total = (scope.row.totalAmount * scope.row.exchangeRate) + (scope.row.totalAmount * scope.row.exchangeRate) * (scope.row.taxRate/100) }}</span>
+          </template>
+        </el-table-column>
       </el-table>
 
       <el-form
@@ -405,7 +409,7 @@
 </template>
 
 <script>
-import { userList } from "@/api/system/user";
+import { listSimpleUsers } from "@/api/system/user";
 import { DICT_TYPE } from "@/utils/dict";
 import { getToken } from "@/utils/auth";
 import { getChannelList } from "@/api/ecw/channel";
@@ -475,7 +479,7 @@ export default {
         this.defaultList = [...res.data]
       })
     }
-    userList("salesman").then((res) => (that.creatorData = res.data));
+    listSimpleUsers().then((res) => (that.creatorData = res.data));
     getChannelList().then((res) => (that.channelList = res.data));
     getTradeCityList().then((res) => (that.tradeCityList = res.data));
     getBankAccountPage(that.params).then(

src/views/ecw/financial/paymentVoucher.vue

@@ -71,6 +71,7 @@
             <el-date-picker
               v-model="queryParams.beginCreateTime"
               type="datetimerange"
+              value-format="yyyy-MM-dd"
               range-separator="到"
               start-placeholder="请选择日期"
               end-placeholder="请选择日期">
@@ -247,7 +248,7 @@ export default {
       this.loading = true;
       // 处理查询参数
       let params = { ...this.queryParams };
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime");
+      this.addBeginAndEndTime(params, this.queryParams.beginCreateTime, "createTime");
       // 执行查询
       getPaymentList(params).then((response) => {
         this.list = response.data.list;
@@ -281,7 +282,7 @@ export default {
     },
     deleteClick(row) {
       const id = row.id;
-      this.$modal.confirm('是否确认删除该应付款?').then(function() {
+      this.$modal.confirm('是否确认删除该付款单?').then(function() {
         return deletePayment(id);
       }).then(() => {
         this.getList();

src/views/ecw/financial/printPaymentVoucher.vue

@@ -29,11 +29,11 @@
       </div>
       <table border="1" style="margin-top: 20px;width: 100%;text-align: center;border-collapse: collapse;line-height: 2 ">
           <tr>
-            <th style="width: 4%;">序号</th>
+            <th style="width: 6%;">序号</th>
             <th style="width: 15%;">自编号</th>
             <th style="width: 15%;">费用类型</th>
             <th style="width: 15%;">币别</th>
-            <th style="width: 12%;">汇率</th>
+            <th style="width: 10%;">汇率</th>
             <th style="width: 15%;">发票号</th>
             <th style="width: 12%;">应付金额</th>
             <th style="width: 12%;">申请金额</th>

src/views/ecw/financial/receivable.vue

@@ -209,15 +209,25 @@
           ></dict-tag>
         </template>
       </el-table-column>
-      <el-table-column label="单价美元" align="center" prop="unitPrice" />
-      <el-table-column label="总金额美元" align="center" prop="totalAmount" />
+      <el-table-column label="单价" align="center" prop="unitPrice">
+        <template slot-scope="scope">
+          <span>{{ scope.row.unitPrice }}</span>
+          <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
+        </template>
+      </el-table-column>
+      <el-table-column label="总金额" align="center" prop="totalAmount">
+        <template slot-scope="scope">
+          <span>{{ scope.row.totalAmount }}</span>
+          <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
+        </template>
+      </el-table-column>
       <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
-          <el-button size="mini" type="text" @click="handleAdd(scope.row)"
+          <el-button size="mini" type="text" @click="handleAdd(scope.row.id)"
             >收款</el-button
           >
         </template>
@@ -301,9 +311,8 @@ export default {
       this.getList();
     },
     /** 新增按钮操作 */
-    handleAdd(row) {
-      // return this.$router.push("creatCollection?id=" + row.id, { params });
-      return this.$router.push({ path: "creatCollection?id=" + row.id, query: { data: JSON.stringify(row) } })
+    handleAdd(id) {
+      return this.$router.push("creatCollection?receiptId=" + id);
     },
     submitForm() {},
   },

src/views/ecw/order/warehousing/components/editDialog.vue

@@ -315,7 +315,7 @@ export default {
       return [...this.warehousing.orderWarehouseInBackItemDoList, ...this.form.orderWarehouseInItemDoList]
     },
     isBeian(){
-      return this.brandList.find(e => e.titleZh === this.form.brand) ? '有备案' : '无备案'
+      return ['无备案', '有备案', '中性'][this.warehousing.brandType]
     },
     brand(){
       if (!!this.form.brand){

src/views/ecw/order/warehousing/index.vue

@@ -25,7 +25,7 @@
       <el-table-column
         label="填单货物属性">
         <template v-slot="{row}">
-          品牌：{{ row.brand !== '0' ? '有' : '无' }}<br>
+          品牌：{{ ['无牌', '有牌', '中性'][row.brandType] }}<br>
           箱数：{{ row.num }}<br>
           体积：{{ row.volume }}m³<br>
           重量：{{ row.weight }}Kg
@@ -34,10 +34,12 @@
       <el-table-column
         label="入库货物属性">
         <template v-slot="{row}">
-          品牌：{{ row.brand !== '0' ? '有' : '无' }}<br>
-          箱数：{{ row.warehouseInInfoVO.cartonsNum }}<br>
-          体积：{{ row.warehouseInInfoVO.volume }}m³<br>
-          重量：{{ row.warehouseInInfoVO.weight }}Kg
+          <template v-if="row.warehouseInInfoVO">
+            品牌：{{ ['无牌', '有牌', '中性'][row.brandType] }}<br>
+            箱数：{{ row.warehouseInInfoVO.cartonsNum }}<br>
+            体积：{{ row.warehouseInInfoVO.volume }}m³<br>
+            重量：{{ row.warehouseInInfoVO.weight }}Kg
+          </template>
         </template>
       </el-table-column>
       <el-table-column

src/views/member/user/index.vue

@@ -301,14 +301,14 @@ export default {
         name: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
         cardType: [{ required: true, message: "证件类型不能为空", trigger: "blur" }],
         cardNumber: [{ required: true, message: "证件号码不能为空", trigger: "blur" }],
-        img1: [{ required: true, message: "身份正面照不能为空", trigger: "blur" }],
-        img2: [{ required: true, message: "身份正面照不能为空", trigger: "blur" }],
+        img1: [{ required: true, message: "身份正面照不能为空", trigger: ['blur','change'] }],
+        img2: [{ required: true, message: "身份正面照不能为空", trigger: ['blur','change'] }],
       },
       rulesEnterprise: {
         name: [{required: true, message: "企业名称不能为空", trigger: "blur"}],
         legalName: [{required: true, message: "企业法人不能为空", trigger: "blur"}],
         cardNumber: [{required: true, message: "证件号码不能为空", trigger: "blur"}],
-        img1: [{required: true, message: "证件照不能为空", trigger: "blur"}],
+        img1: [{required: true, message: "证件照不能为空", trigger: ['blur','change']}],
       },
       publicObj:undefined,
       operationLogShow:false,